Changeset 2673 for trunk/gui/scripts

Timestamp:

Nov 14, 2011, 11:58:46 AM (13 years ago)

Author:

gah

Message:

 

Location:

trunk/gui/scripts

Files:

• visviewer.tcl (modified) (4 diffs)
• vtkstreamlinesviewer.tcl (modified) (14 diffs)

trunk/gui/scripts/visviewer.tcl

@@ -72 +72 @@
     protected method Color2RGB { color }
     protected method Euler2XYZ { theta phi psi }
+    protected method StartWaiting {} 
+    protected method StopWaiting {} 
 
     private method Waiting { option widget } 
@@ -415 +417 @@
         flush $_sid
     }
+    return $_done($this)
+}
+
+#
+# ReceiveBytes --
+#
+#    Read some number of bytes from the visualization server. 
+#
+itcl::body Rappture::VisViewer::StartWaiting {} {
     after cancel $_afterId 
     set _afterId [after 500 [itcl::code $this SplashScreen on]]
-    return $_done($this)
+}
+
+itcl::body Rappture::VisViewer::StopWaiting {} { 
+    SplashScreen off
 }
 
@@ -426 +440 @@
 #
 itcl::body Rappture::VisViewer::ReceiveBytes { size } {
-    SplashScreen off
     if { ![CheckConnection] } {
         return 0
@@ -561 +574 @@
         set inner [frame $itk_component(plotarea).view.splash]
         $inner configure -relief raised -bd 2 
-        label $inner.text1 -text "Rendering. Please Wait." \
+        label $inner.text1 -text "Rendering, please wait." \
             -font "Arial 10"
         label $inner.icon 

trunk/gui/scripts/vtkstreamlinesviewer.tcl

@@ -81 +81 @@
     protected method Rotate {option x y}
     protected method SendCmd {string}
+    protected method SendCmdNoWait {string}
     protected method Zoom {option}
 
@@ -98 +99 @@
     private method EventuallyReseed { numPoints } 
     private method EventuallyRotate { q } 
-    private method EventuallyRequestLegend {} 
     private method EventuallySetCutplane { axis args } 
     private method GetImage { args } 
@@ -495 +495 @@
     set _start [clock clicks -milliseconds]
     SendCmd "screen size $_width $_height"
-    EventuallyRequestLegend
+    set _legendPending 1
 
     #SendCmd "imgflush"
@@ -553 +553 @@
         set _cutplanePending 1
         $_dispatcher event -after 100 !${axis}cutplane
-    }
-}
-
-itcl::body Rappture::VtkStreamlinesViewer::EventuallyRequestLegend {} {
-    if { !$_legendPending } {
-        set _legendPending 1
     }
 }
@@ -875 +869 @@
 itcl::body Rappture::VtkStreamlinesViewer::sendto { bytes } {
     SendBytes "$bytes\n"
+    StartWaiting
 }
 
@@ -889 +884 @@
     } else {
         SendBytes "$string\n"
+        StartWaiting
+    }
+}
+
+#
+# SendCmdNoWait
+#
+#       Send commands off to the rendering server.  If we're currently
+#       sending data objects to the server, buffer the commands to be 
+#       sent later.
+#
+itcl::body Rappture::VtkStreamlinesViewer::SendCmdNoWait {string} {
+    if { $_buffering } {
+        append _outbuf $string "\n"
+    } else {
+        SendBytes "$string\n"
     }
 }
@@ -907 +918 @@
     array set info $args
     set bytes [ReceiveBytes $info(-bytes)]
+    StopWaiting
     if { $info(-type) == "image" } {
         if 0 {
@@ -989 +1001 @@
     }
 
+    set _buffering 1
+    set _legendPending 1
     # Turn on buffering of commands to the server.  We don't want to
     # be preempted by a server disconnect/reconnect (which automatically
     # generates a new call to Rebuild).   
-    set _buffering 1
     set _width $w
     set _height $h
@@ -1118 +1131 @@
     # care.  We're finished here.
     blt::busy hold $itk_component(hull)
-    SendBytes $_outbuf;                        
+    sendto $_outbuf;                        
     blt::busy release $itk_component(hull)
     set _outbuf "";                        # Clear the buffer.                
@@ -1509 +1522 @@
                 ChangeColormap $dataobj $comp $palette
             }
-            EventuallyRequestLegend
+            set _legendPending 1
         }
         "streamlines-opacity" {
@@ -1553 +1566 @@
                 SendCmd "cutplane colormode $_colorMode ${name} $dataset"
             }
-            EventuallyRequestLegend
+            set _legendPending 1
         }
         default {
@@ -1569 +1582 @@
 #
 itcl::body Rappture::VtkStreamlinesViewer::RequestLegend {} {
-    puts stderr "RequestLegend"
-    set _legendPending 0
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
@@ -1590 +1601 @@
         foreach {dataobj comp} [split $dataset -] break
         if { [info exists _dataset2style($dataset)] } {
-            SendCmd "legend $_dataset2style($dataset) $_colorMode $name {} $w $h 0"
+            SendCmdNoWait \
+                "legend $_dataset2style($dataset) $_colorMode $name {} $w $h 0"
             break;
         }
@@ -2568 +2580 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkStreamlinesViewer::ReceiveLegend { colormap title vmin vmax size } {
+    set _legendPending 0
     puts stderr "ReceiveLegend colormap=$colormap title=$title range=$vmin,$vmax size=$size"
     set _limits(vmin) $vmin