Changeset 5188 for trunk/gui/scripts/nanovisviewer.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/nanovisviewer.tcl (modified) (7 diffs)

trunk/gui/scripts/nanovisviewer.tcl

@@ -560 +560 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::NanovisViewer::scale {args} {
-    array set styles {
+    array set style {
         -color    BCGYR
         -levels   6
@@ -574 +574 @@
             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
@@ -1038 +1038 @@
         set tag $_first-$cname
         if { [info exists _serverDatasets($tag)] && $_serverDatasets($tag) } {
-            array set styles {
+            array set style {
                 -cutplanes 1
             }
-            array set styles [lindex [$_first components -style $cname] 0]
-            if { $what != "-cutplanes" || $styles(-cutplanes) } {
+            array set style [lindex [$_first components -style $cname] 0]
+            if { $what != "-cutplanes" || $style(-cutplanes) } {
                 lappend rlist $tag
             }
@@ -1413 +1413 @@
 #
 itcl::body Rappture::NanovisViewer::NameTransferFunction { dataobj cname } {
-    array set styles {
+    array set style {
         -color BCGYR
         -levels 6
@@ -1419 +1419 @@
     }
     set tag $dataobj-$cname
-    array set styles [lindex [$dataobj components -style $cname] 0]
+    array set style [lindex [$dataobj components -style $cname] 0]
     if { ![info exists _cname2transferFunction($cname)] } {
         # Get the colormap right now, since it doesn't change with marker
         # changes.
-        set cmap [ColorsToColormap $styles(-color)]
+        set cmap [ColorsToColormap $style(-color)]
         set amap [list 0.0 0.0 1.0 1.0]
         set _cname2transferFunction($cname) [list $cmap $amap]
@@ -1459 +1459 @@
     # reference.
     if { ![info exists _parsedFunction($cname)] } {
-        array set styles {
+        array set style {
             -color BCGYR
             -levels 6
@@ -1467 +1467 @@
         foreach tag [GetDatasetsWithComponent $cname] {
             foreach {dataobj cname} [split [lindex $tag 0] -] break
-            array set styles [lindex [$dataobj components -style $cname] 0]
+            array set style [lindex [$dataobj components -style $cname] 0]
         }
         eval $_transferFunctionEditors($cname) limits $_limits($cname)
         # Have to defer creation of isomarkers until we have data limits
-        if { [info exists styles(-markers)] &&
-             [llength $styles(-markers)] > 0 } {
-            ParseMarkersOption $cname $styles(-markers)
+        if { [info exists style(-markers)] &&
+             [llength $style(-markers)] > 0 } {
+            ParseMarkersOption $cname $style(-markers)
         } else {
-            ParseLevelsOption $cname $styles(-levels)
+            ParseLevelsOption $cname $style(-levels)
         }