Changeset 4072

Timestamp:

Dec 6, 2013, 10:35:26 PM (11 years ago)

Author:

ldelgass

Message:

Legend fixes for vtk volume viewer

File:

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

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ -498 +498 @@
     if { !$_legendPending } {
         set _legendPending 1
-        $_dispatcher event -after 600 !legend
+        $_dispatcher event -idle !legend
     }
 }
@@ -997 +997 @@
     # generates a new call to Rebuild).   
     StartBufferingCommands
-
-    set _legendPending 1
 
     if { $_reset } {
@@ -1118 +1116 @@
         SendCmd "camera reset"
         SendCmd "camera zoom $_view(zoom)"
+        RequestLegend
         set _reset 0
     }
@@ -1517 +1516 @@
             set _settings($_current-colormap) $color
             ResetColormap $_current $color
-            set _legendPending 1
         }
         "field" {
@@ -1554 +1552 @@
 #
 #       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 $itk_option(-font) -linespace]
@@ -2164 +2162 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkVolumeViewer::ReceiveLegend { colormap title vmin vmax size } {
-    set _legendPending 0
     if { [isconnected] } {
         set bytes [ReceiveBytes $size]