Changeset 6330 for trunk

Timestamp:

May 14, 2016, 4:42:36 AM (8 years ago)

Author:

ldelgass

Message:

Remove redundant SetCurrentColormap? in vtkisosurfaceviewer SetObjectStyle?. Need
to wait until objects are created to change the colormap. Also add constcolor
style for consistency.

File:

• trunk/gui/scripts/vtkisosurfaceviewer.tcl (modified) (6 diffs)

trunk/gui/scripts/vtkisosurfaceviewer.tcl

@@ -2256 +2256 @@
     array set style {
         -color                  BCGYR
+        -constcolor             white
         -cutplaneedges          0
         -cutplanelighting       1
@@ -2281 +2282 @@
         set style(-opacity) 1.0
     }
+    set style(-constcolor) $itk_option(-plotforeground)
     array set style [$dataobj style $comp]
     #DebugTrace [array get style]
@@ -2312 +2314 @@
     }
     if { $_currentColormap == "" } {
-        SetCurrentColormap $style(-color)
         $itk_component(colormap) value $style(-color)
     }
@@ -2340 +2341 @@
 
     SendCmd "cutplane add $tag"
-    SendCmd "cutplane color [Color2RGB $itk_option(-plotforeground)] $tag"
+    SendCmd "cutplane color [Color2RGB $style(-constcolor)] $tag"
     foreach axis {x y z} {
         set pos [expr $style(-${axis}cutplaneposition) * 0.01]
@@ -2356 +2357 @@
 
     SendCmd "outline add $tag"
-    SendCmd "outline color [Color2RGB $itk_option(-plotforeground)] $tag"
+    SendCmd "outline color [Color2RGB $style(-constcolor)] $tag"
     SendCmd "outline visible $style(-outline) $tag"
 
@@ -2364 +2365 @@
     SendCmd "contour3d edges $style(-edges) $tag"
     set _settings(-isosurfaceedges) $style(-edges)
-    #SendCmd "contour3d color [Color2RGB $style(-color)] $tag"
+    #SendCmd "contour3d color [Color2RGB $style(-constcolor)] $tag"
     SendCmd "contour3d lighting $style(-lighting) $tag"
     set _settings(-isosurfacelighting) $style(-lighting)