Changeset 6465 for trunk/gui/scripts


Ignore:
Timestamp:
Aug 3, 2016, 11:29:33 PM (8 years ago)
Author:
ldelgass
Message:

Code style change: use style as array name in SetObjectStyle? like other viewers.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/gui/scripts/vtkviewer.tcl

    r6464 r6465  
    26322632    set tag $dataobj-$comp
    26332633    set type [$dataobj type $comp]
    2634     set style [$dataobj style $comp]
    26352634    switch -- $type {
    26362635        "glyphs" {
    2637             array set settings {
     2636            array set style {
    26382637                -color BCGYR
    26392638                -colormode constant
    … …  
    26552654                -wireframe 0
    26562655            }
    2657             array set settings $style
     2656            array set style [$dataobj style $comp]
    26582657            set shape [$dataobj shape $comp]
    26592658            if {$shape != ""} {
    2660                 set settings(-shape) $shape
     2659                set style(-shape) $shape
    26612660            }
    26622661            # Backwards compat with camel case style option
    2663             if { [info exists settings(-orientGlyphs)] } {
    2664                 set settings(-orientglyphs) $settings(-orientGlyphs)
    2665                 array unset settings -orientGlyphs
     2662            if { [info exists style(-orientGlyphs)] } {
     2663                set style(-orientglyphs) $style(-orientGlyphs)
     2664                array unset style -orientGlyphs
    26662665            }
    26672666            # Backwards compat with camel case style option
    2668             if { [info exists settings(-scaleMode)] } {
    2669                 set settings(-scalemode) $settings(-scaleMode)
    2670                 array unset settings -scaleMode
     2667            if { [info exists style(-scaleMode)] } {
     2668                set style(-scalemode) $style(-scaleMode)
     2669                array unset style -scaleMode
    26712670            }
    26722671            SendCmd "outline add $tag"
    2673             SendCmd "outline color [Color2RGB $settings(-constcolor)] $tag"
    2674             SendCmd "outline visible $settings(-outline) $tag"
    2675             set _settings(glyphs-outline) $settings(-outline)
    2676 
    2677             SendCmd "glyphs add $settings(-shape) $tag"
    2678             SendCmd "glyphs normscale $settings(-normscale) $tag"
    2679             SendCmd "glyphs gscale $settings(-gscale) $tag"
    2680             SendCmd "glyphs wireframe $settings(-wireframe) $tag"
    2681             SendCmd "glyphs color [Color2RGB $settings(-constcolor)] $tag"
    2682             #SendCmd "glyphs colormode $settings(-colormode) {} $tag"
     2672            SendCmd "outline color [Color2RGB $style(-constcolor)] $tag"
     2673            SendCmd "outline visible $style(-outline) $tag"
     2674            set _settings(glyphs-outline) $style(-outline)
     2675
     2676            SendCmd "glyphs add $style(-shape) $tag"
     2677            SendCmd "glyphs normscale $style(-normscale) $tag"
     2678            SendCmd "glyphs gscale $style(-gscale) $tag"
     2679            SendCmd "glyphs wireframe $style(-wireframe) $tag"
     2680            SendCmd "glyphs color [Color2RGB $style(-constcolor)] $tag"
     2681            #SendCmd "glyphs colormode $style(-colormode) {} $tag"
    26832682            # Colormap is set by call to SetColormap below
    2684             set _settings(glyphs-colormap) $settings(-color)
    2685             $itk_component(glyphscolormap) value [$itk_component(glyphscolormap) label $settings(-color)]
     2683            set _settings(glyphs-colormap) $style(-color)
     2684            $itk_component(glyphscolormap) value [$itk_component(glyphscolormap) label $style(-color)]
    26862685            # Omitting field name for gorient and smode commands
    26872686            # defaults to active scalars or vectors depending on mode
    2688             SendCmd "glyphs gorient $settings(-orientglyphs) {} $tag"
    2689             SendCmd "glyphs smode $settings(-scalemode) {} $tag"
    2690             SendCmd "glyphs edges $settings(-edges) $tag"
    2691             SendCmd "glyphs linecolor [Color2RGB $settings(-edgecolor)] $tag"
    2692             SendCmd "glyphs linewidth $settings(-linewidth) $tag"
    2693             SendCmd "glyphs ptsize $settings(-ptsize) $tag"
    2694             SendCmd "glyphs quality $settings(-quality) $tag"
    2695             SendCmd "glyphs lighting $settings(-lighting) $tag"
    2696             SendCmd "glyphs opacity $settings(-opacity) $tag"
    2697             set _settings(glyphs-opacity) [expr 100.0 * $settings(-opacity)]
    2698             SendCmd "glyphs visible $settings(-visible) $tag"
    2699             set _settings(glyphs-wireframe) $settings(-wireframe)
     2687            SendCmd "glyphs gorient $style(-orientglyphs) {} $tag"
     2688            SendCmd "glyphs smode $style(-scalemode) {} $tag"
     2689            SendCmd "glyphs edges $style(-edges) $tag"
     2690            SendCmd "glyphs linecolor [Color2RGB $style(-edgecolor)] $tag"
     2691            SendCmd "glyphs linewidth $style(-linewidth) $tag"
     2692            SendCmd "glyphs ptsize $style(-ptsize) $tag"
     2693            SendCmd "glyphs quality $style(-quality) $tag"
     2694            SendCmd "glyphs lighting $style(-lighting) $tag"
     2695            SendCmd "glyphs opacity $style(-opacity) $tag"
     2696            set _settings(glyphs-opacity) [expr 100.0 * $style(-opacity)]
     2697            SendCmd "glyphs visible $style(-visible) $tag"
     2698            set _settings(glyphs-wireframe) $style(-wireframe)
    27002699        }
    27012700        "molecule" {
    2702             array set settings {
     2701            array set style {
    27032702                -atomscale 0.3
    27042703                -atomsvisible 1
    … …  
    27342733            }
    27352734            if {!$haveElementArray} {
    2736                 set settings(-bondcolormode) constant
    2737                 set settings(-colorfield) ""
    2738                 set settings(-color) BCGYR
    2739                 set settings(-colormode) scalar
    2740             }
    2741             array set settings $style
     2735                set style(-bondcolormode) constant
     2736                set style(-colorfield) ""
     2737                set style(-color) BCGYR
     2738                set style(-colormode) scalar
     2739            }
     2740            array set style [$dataobj style $comp]
    27422741
    27432742            SendCmd "outline add $tag"
    2744             SendCmd "outline color [Color2RGB $settings(-constcolor)] $tag"
    2745             SendCmd "outline visible $settings(-outline) $tag"
    2746             set _settings(molecule-outline) $settings(-outline)
     2743            SendCmd "outline color [Color2RGB $style(-constcolor)] $tag"
     2744            SendCmd "outline visible $style(-outline) $tag"
     2745            set _settings(molecule-outline) $style(-outline)
    27472746
    27482747            SendCmd "molecule add $tag"
    2749             if {$settings(-representation) != ""} {
    2750                 switch -- $settings(-representation) {
     2748            if {$style(-representation) != ""} {
     2749                switch -- $style(-representation) {
    27512750                    "ballandstick" {
    27522751                        set _settings(molecule-rscale) covalent
    … …  
    28072806                SendCmd "molecule ascale $_settings(molecule-atomscale) $tag"
    28082807                SendCmd "molecule bscale $_settings(molecule-bondscale) $tag"
    2809                 $itk_component(representation) value [$itk_component(representation) label $settings(-representation)]
     2808                $itk_component(representation) value [$itk_component(representation) label $style(-representation)]
    28102809                $itk_component(rscale) value [$itk_component(rscale) label $_settings(molecule-rscale)]
    2811                 switch -- $settings(-representation) {
     2810                switch -- $style(-representation) {
    28122811                    "ballandstick" - "balls" - "spheres" {
    28132812                        $itk_component(rscale) configure -state normal
    … …  
    28182817                }
    28192818            } else {
    2820                 SendCmd "molecule rscale $settings(-rscale) $tag"
    2821                 set _settings(molecule-rscale) $settings(-rscale)
    2822                 SendCmd "molecule atoms $settings(-atomsvisible) $tag"
    2823                 set _settings(molecule-atoms-visible) $settings(-atomsvisible)
    2824                 SendCmd "molecule bonds $settings(-bondsvisible) $tag"
    2825                 set _settings(molecule-bonds-visible) $settings(-bondsvisible)
    2826                 SendCmd "molecule bstyle $settings(-bondstyle) $tag"
    2827                 set _settings(molecule-bondstyle) $settings(-bondstyle)
    2828                 SendCmd "molecule ascale $settings(-atomscale) $tag"
    2829                 set _settings(molecule-atomscale) $settings(-atomscale)
    2830                 SendCmd "molecule bscale $settings(-bondscale) $tag"
    2831                 set _settings(molecule-bondscale) $settings(-bondscale)
    2832             }
    2833             SendCmd "molecule labels $settings(-labels) $tag"
    2834             set _settings(molecule-labels) $settings(-labels)
    2835             SendCmd "molecule color [Color2RGB $settings(-constcolor)] $tag"
    2836             SendCmd "molecule bcolor [Color2RGB $settings(-bondconstcolor)] $tag"
    2837             SendCmd [list molecule colormode $settings(-colormode) $settings(-colorfield) $tag]
    2838             SendCmd "molecule bcmode $settings(-bondcolormode) $tag"
    2839             set _settings(molecule-colormode) $settings(-colormode)
    2840             set _settings(molecule-colorfield) $settings(-colorfield)
     2819                SendCmd "molecule rscale $style(-rscale) $tag"
     2820                set _settings(molecule-rscale) $style(-rscale)
     2821                SendCmd "molecule atoms $style(-atomsvisible) $tag"
     2822                set _settings(molecule-atoms-visible) $style(-atomsvisible)
     2823                SendCmd "molecule bonds $style(-bondsvisible) $tag"
     2824                set _settings(molecule-bonds-visible) $style(-bondsvisible)
     2825                SendCmd "molecule bstyle $style(-bondstyle) $tag"
     2826                set _settings(molecule-bondstyle) $style(-bondstyle)
     2827                SendCmd "molecule ascale $style(-atomscale) $tag"
     2828                set _settings(molecule-atomscale) $style(-atomscale)
     2829                SendCmd "molecule bscale $style(-bondscale) $tag"
     2830                set _settings(molecule-bondscale) $style(-bondscale)
     2831            }
     2832            SendCmd "molecule labels $style(-labels) $tag"
     2833            set _settings(molecule-labels) $style(-labels)
     2834            SendCmd "molecule color [Color2RGB $style(-constcolor)] $tag"
     2835            SendCmd "molecule bcolor [Color2RGB $style(-bondconstcolor)] $tag"
     2836            SendCmd [list molecule colormode $style(-colormode) $style(-colorfield) $tag]
     2837            SendCmd "molecule bcmode $style(-bondcolormode) $tag"
     2838            set _settings(molecule-colormode) $style(-colormode)
     2839            set _settings(molecule-colorfield) $style(-colorfield)
    28412840            # Colormap is set by call to SetColormap below
    2842             set _settings(molecule-colormap) $settings(-color)
    2843             $itk_component(moleculecolormap) value [$itk_component(moleculecolormap) label $settings(-color)]
    2844             SendCmd "molecule linecolor [Color2RGB $settings(-edgecolor)] $tag"
    2845             SendCmd "molecule linewidth $settings(-linewidth) $tag"
    2846             SendCmd "molecule edges $settings(-edges) $tag"
    2847             set _settings(molecule-edges) $settings(-edges)
    2848             SendCmd "molecule lighting $settings(-lighting) $tag"
    2849             set _settings(molecule-lighting) $settings(-lighting)
    2850             SendCmd "molecule aquality $settings(-quality) $tag"
    2851             SendCmd "molecule bquality $settings(-quality) $tag"
    2852             set _settings(molecule-quality) $settings(-quality)
    2853             SendCmd "molecule visible $settings(-visible) $tag"
    2854             set _settings(molecule-visible) $settings(-visible)
     2841            set _settings(molecule-colormap) $style(-color)
     2842            $itk_component(moleculecolormap) value [$itk_component(moleculecolormap) label $style(-color)]
     2843            SendCmd "molecule linecolor [Color2RGB $style(-edgecolor)] $tag"
     2844            SendCmd "molecule linewidth $style(-linewidth) $tag"
     2845            SendCmd "molecule edges $style(-edges) $tag"
     2846            set _settings(molecule-edges) $style(-edges)
     2847            SendCmd "molecule lighting $style(-lighting) $tag"
     2848            set _settings(molecule-lighting) $style(-lighting)
     2849            SendCmd "molecule aquality $style(-quality) $tag"
     2850            SendCmd "molecule bquality $style(-quality) $tag"
     2851            set _settings(molecule-quality) $style(-quality)
     2852            SendCmd "molecule visible $style(-visible) $tag"
     2853            set _settings(molecule-visible) $style(-visible)
    28552854            set _haveMolecules 1
    28562855        }
    28572856        "polydata" {
    2858             array set settings {
     2857            array set style {
    28592858                -cloudstyle "mesh"
    28602859                -color BCGYR
    … …  
    28702869                -wireframe 0
    28712870            }
    2872             array set settings $style
     2871            array set style [$dataobj style $comp]
    28732872
    28742873            SendCmd "outline add $tag"
    2875             SendCmd "outline color [Color2RGB $settings(-constcolor)] $tag"
    2876             SendCmd "outline visible $settings(-outline) $tag"
    2877             set _settings(polydata-outline) $settings(-outline)
     2874            SendCmd "outline color [Color2RGB $style(-constcolor)] $tag"
     2875            SendCmd "outline visible $style(-outline) $tag"
     2876            set _settings(polydata-outline) $style(-outline)
    28782877
    28792878            SendCmd "polydata add $tag"
    2880             SendCmd "polydata visible $settings(-visible) $tag"
    2881             set _settings(polydata-visible) $settings(-visible)
    2882             SendCmd "polydata edges $settings(-edges) $tag"
    2883             set _settings(polydata-edges) $settings(-edges)
    2884             SendCmd "polydata cloudstyle $settings(-cloudstyle) $tag"
    2885             SendCmd "polydata color [Color2RGB $settings(-constcolor)] $tag"
    2886             #SendCmd "polydata colormode $settings(-colormode) {} $tag"
     2879            SendCmd "polydata visible $style(-visible) $tag"
     2880            set _settings(polydata-visible) $style(-visible)
     2881            SendCmd "polydata edges $style(-edges) $tag"
     2882            set _settings(polydata-edges) $style(-edges)
     2883            SendCmd "polydata cloudstyle $style(-cloudstyle) $tag"
     2884            SendCmd "polydata color [Color2RGB $style(-constcolor)] $tag"
     2885            #SendCmd "polydata colormode $style(-colormode) {} $tag"
    28872886            # Colormap is set by call to SetColormap below
    2888             set _settings(polydata-colormap) $settings(-color)
    2889             $itk_component(polydatacolormap) value [$itk_component(polydatacolormap) label $settings(-color)]
    2890             SendCmd "polydata lighting $settings(-lighting) $tag"
    2891             set _settings(polydata-lighting) $settings(-lighting)
    2892             SendCmd "polydata linecolor [Color2RGB $settings(-edgecolor)] $tag"
    2893             SendCmd "polydata linewidth $settings(-linewidth) $tag"
    2894             SendCmd "polydata opacity $settings(-opacity) $tag"
    2895             set _settings(polydata-opacity) [expr 100.0 * $settings(-opacity)]
    2896             SendCmd "polydata wireframe $settings(-wireframe) $tag"
    2897             set _settings(polydata-wireframe) $settings(-wireframe)
     2887            set _settings(polydata-colormap) $style(-color)
     2888            $itk_component(polydatacolormap) value [$itk_component(polydatacolormap) label $style(-color)]
     2889            SendCmd "polydata lighting $style(-lighting) $tag"
     2890            set _settings(polydata-lighting) $style(-lighting)
     2891            SendCmd "polydata linecolor [Color2RGB $style(-edgecolor)] $tag"
     2892            SendCmd "polydata linewidth $style(-linewidth) $tag"
     2893            SendCmd "polydata opacity $style(-opacity) $tag"
     2894            set _settings(polydata-opacity) [expr 100.0 * $style(-opacity)]
     2895            SendCmd "polydata wireframe $style(-wireframe) $tag"
     2896            set _settings(polydata-wireframe) $style(-wireframe)
    28982897            set havePolyData 1
    28992898        }
Note: See TracChangeset for help on using the changeset viewer.