Changeset 4475 for branches

Timestamp:

Jul 9, 2014, 9:10:33 PM (10 years ago)

Author:

ldelgass

Message:

merge from trunk

Location:

branches/1.3

Files:

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

branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl

@@ -236 +236 @@
         -axesvisible                    1
         -axislabelsvisible              1
-        -background                     black
-        -colormap                       BCGYR
-        -colormapvisible                1
+        -axismode                       "static"
+        -background                     black
+        -colormap                       BCGYR
+        -colormapvisible                1
         -cutplaneedges                  0
         -cutplanelighting               1
@@ -245 +246 @@
         -cutplanesvisible               0
         -cutplanewireframe              0
-        -field                          "Default"
-        -isolinecolor                   white
+        -field                          "Default"
+        -isolinecolor                   white
         -isosurfaceedges                0
         -isosurfacelighting             1
@@ -266 +267 @@
     }
     array set _changed {
+        -colormap                0
         -isosurfaceopacity       0
-        -colormap                0
         -numcontours             0
     }
@@ -1439 +1440 @@
         }
         "-colormap" {
-            set _changed(-colormap) 1
+            set _changed($what) 1
             StartBufferingCommands
             set color [$itk_component(colormap) value]
@@ -1819 +1820 @@
         "furthest_triad"  "farthest" \
         "outer_edges"     "outer"         
-    $itk_component(axisMode) value "static"
+    $itk_component(axisMode) value $_settings(-axismode)
     bind $inner.mode <<Value>> [itcl::code $this AdjustSetting -axismode]
 
@@ -2171 +2172 @@
         set style(-opacity) 1
     }
-    SendCmd "cutplane add $tag"
-    SendCmd "cutplane visible 0 $tag"
 
     # This is too complicated.  We want to set the colormap, number of
@@ -2211 +2210 @@
     set _settings(-zcutplaneposition) $style(-zcutplaneposition)
  
-    GenerateContourList
-    SendCmd [list contour3d add contourlist $_contourList(values) $tag]
-
-    SendCmd "contour3d edges $style(-edges) $tag"
+    SendCmd "cutplane add $tag"
+    SendCmd "cutplane visible $style(-cutplanesvisible) $tag"
+
     SendCmd "outline add $tag"
     SendCmd "outline color [Color2RGB $itk_option(-plotforeground)] $tag"
     SendCmd "outline visible $style(-outline) $tag"
     set _settings(-outline) $style(-outline)
+ 
+    GenerateContourList
+    SendCmd [list contour3d add contourlist $_contourList(values) $tag]
+    SendCmd "contour3d visible $style(-isosurfacevisible) $tag"
+    SendCmd "contour3d edges $style(-edges) $tag"
     set _settings(-isosurfaceedges) $style(-edges)
     #SendCmd "contour3d color [Color2RGB $settings(-color)] $tag"