Changeset 4404 for trunk

Timestamp:

Jun 20, 2014, 5:28:56 PM (10 years ago)

Author:

ldelgass

Message:

s/style/styles

Location:

trunk/gui/scripts

Files:

• flowvisviewer.tcl (modified) (8 diffs)
• nanovisviewer.tcl (modified) (7 diffs)

trunk/gui/scripts/flowvisviewer.tcl

@@ -736 +736 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::FlowvisViewer::scale {args} {
-    array set style {
+    array set styles {
         -color BCGYR
         -levels 6
@@ -751 +751 @@
             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
@@ -1279 +1279 @@
     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)
             }
@@ -1757 +1757 @@
 #
 itcl::body Rappture::FlowvisViewer::NameTransferFunc { dataobj cname } {
-    array set style {
+    array set styles {
         -color BCGYR
         -levels 6
@@ -1764 +1764 @@
         -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
@@ -1783 +1783 @@
 #
 itcl::body Rappture::FlowvisViewer::ComputeTransferFunc { tf } {
-    array set style {
+    array set styles {
         -color BCGYR
         -levels 6
@@ -1795 +1795 @@
         return 0
     }
-    array set style [lindex [$dataobj components -style $comp] 0]
+    array set styles [lindex [$dataobj components -style $comp] 0]
 
 
@@ -1813 +1813 @@
     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)

trunk/gui/scripts/nanovisviewer.tcl

@@ -557 +557 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::NanovisViewer::scale {args} {
-    array set style {
+    array set styles {
         -color BCGYR
         -levels 6
@@ -571 +571 @@
             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
@@ -1055 +1055 @@
         set tag $_first-$cname
         if { [info exists _serverDatasets($tag)] && $_serverDatasets($tag) } {
-            array set style {
+            array set styles {
                 -cutplanes 1
             }
-            array set style [lindex [$_first components -style $cname] 0]
-            if { $what != "-cutplanes" || $style(-cutplanes) } {
+            array set styles [lindex [$_first components -style $cname] 0]
+            if { $what != "-cutplanes" || $styles(-cutplanes) } {
                 lappend rlist $tag
             }
@@ -1428 +1428 @@
 #
 itcl::body Rappture::NanovisViewer::NameTransferFunction { dataobj cname } {
-    array set style {
+    array set styles {
         -color BCGYR
         -levels 6
@@ -1434 +1434 @@
     }
     set tag $dataobj-$cname
-    array set style [lindex [$dataobj components -style $cname] 0]
+    array set styles [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 $style(-color)]
+        set cmap [ColorsToColormap $styles(-color)]
         set wmap [list 0.0 0.0 1.0 1.0]
         set _cname2transferFunction($cname) [list $cmap $wmap]
@@ -1474 +1474 @@
     # reference.
     if { ![info exists _parsedFunction($cname)] } {
-        array set style {
+        array set styles {
             -color BCGYR
             -levels 6
@@ -1482 +1482 @@
         foreach tag [GetDatasetsWithComponent $cname] {
             foreach {dataobj cname} [split [lindex $tag 0] -] break
-            array set style [lindex [$dataobj components -style $cname] 0]
+            array set styles [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 style(-markers)] &&
-             [llength $style(-markers)] > 0 } {
-            ParseMarkersOption $cname $style(-markers)
+        if { [info exists styles(-markers)] &&
+             [llength $styles(-markers)] > 0 } {
+            ParseMarkersOption $cname $styles(-markers)
         } else {
-            ParseLevelsOption $cname $style(-levels)
+            ParseLevelsOption $cname $styles(-levels)
         }