Changeset 4557 for branches/1.3/gui

Timestamp:

Jul 17, 2014, 9:52:43 PM (10 years ago)

Author:

ldelgass

Message:

merge r4404 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/flowvisviewer.tcl (modified) (8 diffs)

branches/1.3/gui/scripts/flowvisviewer.tcl

@@ -716 +716 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::FlowvisViewer::scale {args} {
-    array set style {
+    array set styles {
         -color BCGYR
         -levels 6
+        -markers ""
         -opacity 1.0
-        -markers ""
     }
     array unset _limits 
@@ -731 +731 @@
             if { ![info exists _volcomponents($cname)] } {
                 lappend _componentsList $cname
-                array set style [lindex [$dataobj components -style $cname] 0]
-                set cmap [ColorsToColormap $style(-color)]
+                array set styles [lindex [$dataobj components -style $cname] 0]
+                set cmap [ColorsToColormap $styles(-color)]
                 set _cname2defaultcolormap($cname) $cmap
-                set _settings($cname-colormap) $style(-color)
+                set _settings($cname-colormap) $styles(-color)
             }
             lappend _volcomponents($cname) $dataobj-$cname
@@ -1255 +1255 @@
     foreach key [array names _serverObjs *-*] {
         if {[string match $_first-* $key]} {
-            array set style {
+            array set styles {
                 -cutplanes 1
             }
             foreach {dataobj comp} [split $key -] break
-            array set style [lindex [$dataobj components -style $comp] 0]
-            if {$what != "-cutplanes" || $style(-cutplanes)} {
+            array set styles [lindex [$dataobj components -style $comp] 0]
+            if {$what != "-cutplanes" || $styles(-cutplanes)} {
                 lappend rlist $_serverObjs($key)
             }
@@ -1703 +1703 @@
 #
 itcl::body Rappture::FlowvisViewer::NameTransferFunc { dataobj cname } {
-    array set style {
+    array set styles {
         -color BCGYR
         -levels 6
@@ -1710 +1710 @@
         -transp 50
     }
-    array set style [lindex [$dataobj components -style $cname] 0]
-    set _settings($this-light) $style(-light)
-    set _settings($this-transp) $style(-transp)
-    set _settings($this-opacity) [expr $style(-opacity) * 100]
+    array set styles [lindex [$dataobj components -style $cname] 0]
+    set _settings($this-light) $styles(-light)
+    set _settings($this-transp) $styles(-transp)
+    set _settings($this-opacity) [expr $styles(-opacity) * 100]
     set _obj2style($dataobj-$cname) $cname
     lappend _style2objs($cname) $dataobj $cname
@@ -1729 +1729 @@
 #
 itcl::body Rappture::FlowvisViewer::ComputeTransferFunc { tf } {
-    array set style {
+    array set styles {
         -color BCGYR
         -levels 6
@@ -1741 +1741 @@
         return 0
     }
-    array set style [lindex [$dataobj components -style $comp] 0]
+    array set styles [lindex [$dataobj components -style $comp] 0]
 
 
@@ -1759 +1759 @@
     if { ![info exists _isomarkers($tf)] } {
         # Have to defer creation of isomarkers until we have data limits
-        if { [info exists style(-markers)] &&
-             [llength $style(-markers)] > 0  } {
-            ParseMarkersOption $tf $style(-markers)
+        if { [info exists styles(-markers)] &&
+             [llength $styles(-markers)] > 0  } {
+            ParseMarkersOption $tf $styles(-markers)
         } else {
-            ParseLevelsOption $tf $style(-levels)
-        }
-    }
-    if { [info exists style(-nonuniformcolors)] } {
-        foreach { value color } $style(-nonuniformcolors) {
+            ParseLevelsOption $tf $styles(-levels)
+        }
+    }
+    if { [info exists styles(-nonuniformcolors)] } {
+        foreach { value color } $styles(-nonuniformcolors) {
             append cmap "$value [Color2RGB $color] "
         }
     } else {
-        set cmap [ColorsToColormap $style(-color)]
+        set cmap [ColorsToColormap $styles(-color)]
     }
     set tag $this-$tf
     if { ![info exists _settings($tag-opacity)] } {
-        set _settings($tag-opacity) $style(-opacity)
+        set _settings($tag-opacity) $styles(-opacity)
     }
     set max 1.0 ;#$_settings($tag-opacity)