Changeset 4746

Timestamp:

Nov 17, 2014 6:54:47 AM (9 years ago)

Author:

ldelgass

Message:

merge r4745 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/vtkisosurfaceviewer.tcl (modified) (2 diffs)
• gui/scripts/vtkvolumeviewer.tcl (modified) (4 diffs)

branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl

@@ -990 +990 @@
         # Reset the camera and other view parameters
         $_arcball quaternion [ViewToQuaternion]
+        InitSettings -ortho
         DoRotate
         PanCamera
         set _first ""
-        InitSettings -xgrid -ygrid -zgrid -axismode \
-            -axesvisible -axislabels -axisminorticks -ortho
+        InitSettings -background \
+            -xgrid -ygrid -zgrid -axismode \
+            -axesvisible -axislabels -axisminorticks
         #SendCmd "axis lformat all %g"
         StopBufferingCommands
@@ -2190 +2192 @@
  
     SendCmd "cutplane add $tag"
+    SendCmd "cutplane color [Color2RGB $itk_option(-plotforeground)] $tag"
     SendCmd "cutplane visible $style(-cutplanesvisible) $tag"
 

branches/1.3/gui/scripts/vtkvolumeviewer.tcl

@@ -954 +954 @@
         }
         DoRotate
-        InitSettings -volumeoutline -background \
+        PanCamera
+        set _first ""
+        InitSettings -background \
             -xgrid -ygrid -zgrid -axisflymode \
             -axesvisible -axislabels -axisminorticks
-        PanCamera
-    }
-
-    SendCmd "imgflush"
+        StopBufferingCommands
+        SendCmd "imgflush"
+        StartBufferingCommands
+     }
     set _first ""
 
@@ -1047 +1049 @@
     InitSettings -volumepalette \
         -volumematerial \
-        -volumeopacity -volumequality -volumevisible \
+        -volumelighting -volumeopacity -volumequality -volumeoutline -volumevisible \
         -cutplanesvisible \
         -xcutplaneposition -ycutplaneposition -zcutplaneposition \
@@ -1053 +1055 @@
 
     if { $_reset } {
-        InitSettings -volumelighting
         Zoom reset
         set _reset 0
@@ -2095 +2096 @@
     array set styles [$dataobj style $cname]
     set _settings(-volumelighting) $styles(-lighting)
+    set _settings(-volumeopacity) [expr $styles(-opacity) * 100.0]
     set _settings(-volumeoutline) $styles(-outline)
-    set _settings(-volumeopacity) [expr $styles(-opacity) * 100.0]
     set _settings(-volumevisible) $styles(-visible)
 
     SendCmd "outline add $tag"
+    SendCmd "outline color [Color2RGB $itk_option(-plotforeground)] $tag"
     SendCmd "outline visible $styles(-outline) $tag"
 
     SendCmd "$_cutplaneCmd add $tag"
+    SendCmd "$_cutplaneCmd color [Color2RGB $itk_option(-plotforeground)] $tag"
     SendCmd "$_cutplaneCmd visible 0 $tag"