Changeset 5188 for trunk/gui/scripts/flowvisviewer.tcl

Timestamp:

Apr 2, 2015, 9:35:24 AM (10 years ago)

Author:

ldelgass

Message:

merge r5187 from 1.4 branch

Location:

trunk

Files:

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

trunk/gui/scripts/flowvisviewer.tcl

@@ -732 +732 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::FlowvisViewer::scale {args} {
-    array set styles {
+    array set style {
         -color BCGYR
         -levels 6
@@ -747 +747 @@
             if { ![info exists _volcomponents($cname)] } {
                 lappend _componentsList $cname
-                array set styles [lindex [$dataobj components -style $cname] 0]
-                set cmap [ColorsToColormap $styles(-color)]
+                array set style [lindex [$dataobj components -style $cname] 0]
+                set cmap [ColorsToColormap $style(-color)]
                 set _cname2defaultcolormap($cname) $cmap
-                set _settings($cname-colormap) $styles(-color)
+                set _settings($cname-colormap) $style(-color)
             }
             lappend _volcomponents($cname) $dataobj-$cname
@@ -1276 +1276 @@
     foreach key [array names _serverObjs *-*] {
         if {[string match $_first-* $key]} {
-            array set styles {
+            array set style {
                 -cutplanes 1
             }
             foreach {dataobj comp} [split $key -] break
-            array set styles [lindex [$dataobj components -style $comp] 0]
-            if {$what != "-cutplanes" || $styles(-cutplanes)} {
+            array set style [lindex [$dataobj components -style $comp] 0]
+            if {$what != "-cutplanes" || $style(-cutplanes)} {
                 lappend rlist $_serverObjs($key)
             }
@@ -1745 +1745 @@
 #
 itcl::body Rappture::FlowvisViewer::NameTransferFunc { dataobj cname } {
-    array set styles {
+    array set style {
         -color BCGYR
         -levels 6
         -opacity 0.5
     }
-    array set styles [lindex [$dataobj components -style $cname] 0]
-    set _settings($this-opacity) [expr $styles(-opacity) * 100]
+    array set style [lindex [$dataobj components -style $cname] 0]
+    set _settings($this-opacity) [expr $style(-opacity) * 100]
     set _obj2style($dataobj-$cname) $cname
     lappend _style2objs($cname) $dataobj $cname
@@ -1767 +1767 @@
 #
 itcl::body Rappture::FlowvisViewer::ComputeTransferFunc { tf } {
-    array set styles {
+    array set style {
         -color BCGYR
         -levels 6
@@ -1777 +1777 @@
         return 0
     }
-    array set styles [lindex [$dataobj components -style $comp] 0]
+    array set style [lindex [$dataobj components -style $comp] 0]
 
     # We have to parse the style attributes for a volume using this
@@ -1794 +1794 @@
     if { ![info exists _isomarkers($tf)] } {
         # Have to defer creation of isomarkers until we have data limits
-        if { [info exists styles(-markers)] &&
-             [llength $styles(-markers)] > 0  } {
-            ParseMarkersOption $tf $styles(-markers)
+        if { [info exists style(-markers)] &&
+             [llength $style(-markers)] > 0  } {
+            ParseMarkersOption $tf $style(-markers)
         } else {
-            ParseLevelsOption $tf $styles(-levels)
-        }
-    }
-    if { [info exists styles(-nonuniformcolors)] } {
-        foreach { value color } $styles(-nonuniformcolors) {
+            ParseLevelsOption $tf $style(-levels)
+        }
+    }
+    if { [info exists style(-nonuniformcolors)] } {
+        foreach { value color } $style(-nonuniformcolors) {
             append cmap "$value [Color2RGB $color] "
         }
     } else {
-        set cmap [ColorsToColormap $styles(-color)]
+        set cmap [ColorsToColormap $style(-color)]
     }
 
     if { ![info exists _settings($this-opacity)] } {
-        set _settings($this-opacity) [expr $styles(-opacity) * 100]
+        set _settings($this-opacity) [expr $style(-opacity) * 100]
     }