Changeset 5465

Timestamp:

May 7, 2015 1:49:00 PM (9 years ago)

Author:

ldelgass

Message:

backport some vtkvolume fixes from trunk

File:

• branches/1.4/gui/scripts/vtkvolumeviewer.tcl (modified) (12 diffs)

branches/1.4/gui/scripts/vtkvolumeviewer.tcl

@@ -148 +148 @@
     private variable _curFldLabel ""
     private variable _colorMode "scalar"; # Mode of colormap (vmag or scalar)
-    private variable _cutplaneCmd "cutplane"
+    private variable _cutplaneCmd "imgcutplane"
     private variable _allowMultiComponent 0
 
@@ -449 +449 @@
     SendCmd "screen size $_width $_height"
 
-    set _legendPending 1
+    EventuallyRequestLegend
     set _resizePending 0
 }
@@ -829 +829 @@
 itcl::body Rappture::VtkVolumeViewer::disconnect {} {
     Disconnect
-    set _reset 1
 }
 
@@ -893 +892 @@
         set _hardcopy($tag) $bytes
     }
-    if { $_legendPending } {
-        RequestLegend
-    }
 }
 
@@ -960 +956 @@
     # generates a new call to Rebuild).
     StartBufferingCommands
-
-    set _legendPending 1
 
     if { $_width != $w || $_height != $h || $_reset } {
@@ -1091 +1085 @@
 
     if { $_reset } {
-        Zoom reset
+        SendCmd "camera reset"
+        SendCmd "camera zoom $_view(-zoom)"
+        RequestLegend
         set _reset 0
     }
@@ -1481 +1477 @@
                 ChangeColormap $dataobj $comp $color
             }
-            set _legendPending 1
+            EventuallyRequestLegend
         }
         "-field" {
@@ -1522 +1518 @@
 #
 #       Request a new legend from the server.  The size of the legend
-#       is determined from the height of the canvas.  It will be rotated
-#       to be vertical when drawn.
+#       is determined from the height of the canvas.
 #
 itcl::body Rappture::VtkVolumeViewer::RequestLegend {} {
+    set _legendPending 0
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
@@ -1691 +1687 @@
         3,0 $inner.legend -cspan 2 -anchor w \
         4,0 $inner.background_l -anchor e -pady 2 \
-        4,1 $inner.background -fill x \
+        4,1 $inner.background -fill x
 
     blt::table configure $inner r* -resize none
@@ -2172 +2168 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkVolumeViewer::ReceiveLegend { colormap title vmin vmax size } {
-    set _legendPending 0
     if { [isconnected] } {
         set bytes [ReceiveBytes $size]
@@ -2189 +2184 @@
 # DrawLegend --
 #
-#       Draws the legend in it's own canvas which resides to the right
-#       of the contour plot area.
-#
-itcl::body Rappture::VtkVolumeViewer::DrawLegend { } {
+itcl::body Rappture::VtkVolumeViewer::DrawLegend {} {
     set fname $_curFldName
     set c $itk_component(view)
@@ -2416 +2408 @@
 
 #
-# GetDatasetsWithComponents --
+# GetDatasetsWithComponent --
 #
 #       Returns a list of all the datasets (known by the combination of