Changeset 2652 for trunk

Timestamp:

Nov 2, 2011, 9:23:19 PM (13 years ago)

Author:

gah

Message:

 

Location:

trunk/gui/scripts

Files:

• visviewer.tcl (modified) (1 diff)
• vtkstreamlinesviewer.tcl (modified) (13 diffs)

trunk/gui/scripts/visviewer.tcl

@@ -559 +559 @@
             return
         }
-        label $itk_component(plotarea).view.splash -text "Please wait"
+        label $itk_component(plotarea).view.splash -text "Please wait" \
+            -bg grey90 -relief solid -bd 2 -padx 20 -pady 20 -font "Arial 10"
         pack $itk_component(plotarea).view.splash -expand yes -anchor c
     } else {

trunk/gui/scripts/vtkstreamlinesviewer.tcl

@@ -98 +98 @@
     private method EventuallyReseed { numPoints } 
     private method EventuallyRotate { q } 
+    private method EventuallyRequestLegend {} 
     private method EventuallySetCutplane { axis args } 
     private method GetImage { args } 
@@ -148 +149 @@
     private variable _rotatePending 0
     private variable _cutplanePending 0
+    private variable _legendPending 0
     private variable _outline
     private variable _vectorFields 
@@ -182 +184 @@
     $_dispatcher register !rotate
     $_dispatcher dispatch $this !rotate "[itcl::code $this DoRotate]; list"
+
+    # Legend event
+    $_dispatcher register !legend
+    $_dispatcher dispatch $this !legend "[itcl::code $this RequestLegend]; list"
 
     # X-Cutplane event
@@ -473 +479 @@
 itcl::body Rappture::VtkStreamlinesViewer::destructor {} {
     Disconnect
-    $_dispatcher cancel !rebuild
-    $_dispatcher cancel !resize
-    $_dispatcher cancel !reseed
-    $_dispatcher cancel !rotate
-    $_dispatcher cancel !xcutplane
-    $_dispatcher cancel !ycutplane
-    $_dispatcher cancel !zcutplane
     image delete $_image(plot)
     image delete $_image(download)
@@ -494 +493 @@
     set _start [clock clicks -milliseconds]
     SendCmd "screen size $_width $_height"
-    RequestLegend
+    EventuallyRequestLegend
 
     #SendCmd "imgflush"
@@ -552 +551 @@
         set _cutplanePending 1
         $_dispatcher event -after 100 !${axis}cutplane
+    }
+}
+
+itcl::body Rappture::VtkStreamlinesViewer::EventuallyRequestLegend {} {
+    if { !$_legendPending } {
+        set _legendPending 1
     }
 }
@@ -845 +850 @@
     VisViewer::Disconnect
 
+    $_dispatcher cancel !rebuild
+    $_dispatcher cancel !resize
+    $_dispatcher cancel !reseed
+    $_dispatcher cancel !rotate
+    $_dispatcher cancel !xcutplane
+    $_dispatcher cancel !ycutplane
+    $_dispatcher cancel !zcutplane
+    $_dispatcher cancel !legend
     # disconnected -- no more data sitting on server
     set _outbuf ""
@@ -910 +923 @@
         set tag $this-print-$info(-token)
         set _hardcopy($tag) $bytes
+    }
+    if { $_legendPending } {
+        RequestLegend
     }
 }
@@ -975 +991 @@
     # generates a new call to Rebuild).   
     set _buffering 1
-
     set _width $w
     set _height $h
@@ -1085 +1100 @@
         set _reset 0
     }
-        
     set _buffering 0;                        # Turn off buffering.
 
@@ -1482 +1496 @@
                 ChangeColormap $dataobj $comp $palette
             }
-            RequestLegend
+            EventuallyRequestLegend
         }
         "streamlines-opacity" {
@@ -1526 +1540 @@
                 SendCmd "cutplane colormode $_colorMode ${name} $dataset"
             }
-            RequestLegend
+            EventuallyRequestLegend
         }
         default {
@@ -1542 +1556 @@
 #
 itcl::body Rappture::VtkStreamlinesViewer::RequestLegend {} {
+    puts stderr "RequestLegend"
+    set _legendPending 0
     set font "Arial 8"
     set lineht [font metrics $font -linespace]