Changeset 6464 for trunk

Timestamp:

Aug 3, 2016, 11:14:25 PM (8 years ago)

Author:

ldelgass

Message:

Ignore "none" in SetColormap?

Location:

trunk/gui/scripts

Files:

• vtkmeshviewer.tcl (modified) (3 diffs)
• vtkviewer.tcl (modified) (2 diffs)

trunk/gui/scripts/vtkmeshviewer.tcl

@@ -1505 +1505 @@
     array set style {
         -cloudstyle mesh
-        -color white
+        -constcolor white
         -edgecolor black
         -edges 1
@@ -1524 +1524 @@
 
     if {[$dataobj hints color] != ""} {
-        set style(-color) [$dataobj hints color]
+        set style(-constcolor) [$dataobj hints color]
     }
     SendCmd "outline add $tag"
-    SendCmd "outline color [Color2RGB $style(-color)] $tag"
+    SendCmd "outline color [Color2RGB $style(-constcolor)] $tag"
     SendCmd "outline visible $style(-outline) $tag"
     set _settings(-outline) $style(-outline)
@@ -1537 +1537 @@
     SendCmd "polydata edges $style(-edges) $tag"
     set _settings(-polydataedges) $style(-edges)
-    SendCmd "polydata color [Color2RGB $style(-color)] $tag"
+    SendCmd "polydata color [Color2RGB $style(-constcolor)] $tag"
     SendCmd "polydata lighting $style(-lighting) $tag"
     set _settings(-polydatalighting) $style(-lighting)

trunk/gui/scripts/vtkviewer.tcl

@@ -1822 +1822 @@
 
     set name "$style(-color)"
-    if { ![info exists _colormaps($name)] } {
+    if { $name != "none" && ![info exists _colormaps($name)] } {
         BuildColormap $name
         set _colormaps($name) 1
@@ -1829 +1829 @@
          $_dataset2style($tag) != $name } {
         set _dataset2style($tag) $name
-        switch -- [$dataobj type $comp] {
-            "polydata" {
-                SendCmd "polydata colormap $name $tag"
-            }
-            "glyphs" {
-                SendCmd "glyphs colormap $name $tag"
-            }
-            "molecule" {
-                SendCmd "molecule colormap $name $tag"
+        if { $name != "none" } {
+            switch -- [$dataobj type $comp] {
+                "polydata" {
+                    SendCmd "polydata colormap $name $tag"
+                }
+                "glyphs" {
+                    SendCmd "glyphs colormap $name $tag"
+                }
+                "molecule" {
+                    SendCmd "molecule colormap $name $tag"
+                }
             }
         }