Changeset 4745 for trunk/gui

Timestamp:

Nov 17, 2014, 6:26:46 AM (10 years ago)

Author:

ldelgass

Message:

sync fixes

Location:

trunk/gui/scripts

Files:

• vtkisosurfaceviewer.tcl (modified) (2 diffs)
• vtkvolumeviewer.tcl (modified) (8 diffs)

trunk/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"
 

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ -691 +691 @@
         }
         # Determine limits for each axis.
-        foreach axis {x y z v} {
+        foreach axis { x y z } {
             foreach { min max } [$dataobj limits $axis] break
             if {"" != $min && "" != $max} {
@@ -1019 +1019 @@
         }
         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 ""
 
@@ -1119 +1121 @@
         -volumeambient -volumediffuse -volumespecularlevel \
         -volumespecularexponent -volumeblendmode -volumethickness \
-        -volumeopacity -volumequality -volumevisible \
+        -volumelighting -volumeopacity -volumequality -volumeoutline -volumevisible \
         -cutplanesvisible \
         -xcutplaneposition -ycutplaneposition -zcutplaneposition \
@@ -1125 +1127 @@
 
     if { $_reset } {
-        InitSettings -volumelighting
         SendCmd "camera reset"
         SendCmd "camera zoom $_view(-zoom)"
@@ -2120 +2121 @@
         5,1 $itk_component(yCutScale)   -fill y \
         4,2 $itk_component(zCutButton)  -anchor e -padx 2 -pady 2 \
-        5,2 $itk_component(zCutScale)   -fill y \
+        5,2 $itk_component(zCutScale)   -fill y
 
     blt::table configure $inner r* c* -resize none
@@ -2234 +2235 @@
         -color      BCGYR
         -lighting   1
+        -opacity    0.5
         -outline    0
         -visible    1
@@ -2239 +2241 @@
     array set styles [$dataobj style $cname]
     set _settings($cname-volumelighting)        $styles(-lighting)
+    set _settings($cname-volumeopacity)         [expr $styles(-opacity) * 100]
     set _settings($cname-volumeoutline)         $styles(-outline)
     set _settings($cname-volumevisible)         $styles(-visible)
@@ -2245 +2248 @@
 
     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"
 
     SendCmd "volume add $tag"
     SendCmd "volume lighting $styles(-lighting) $tag"
+    SendCmd "volume opacity $styles(-opacity) $tag"
     SendCmd "volume visible $styles(-visible) $tag"