Changeset 3421 for trunk/gui/scripts/vtkvolumeviewer.tcl

Timestamp:

Mar 3, 2013, 12:52:51 PM (12 years ago)

Author:

gah

Message:

push SendCmd? into base class w/ buffering

File:

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

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ -59 +59 @@
     public method isconnected {}
     public method limits { colormap }
-    public method sendto { string }
     public method parameters {title args} { 
         # do nothing 
@@ -80 +79 @@
     protected method ReceiveLegend { colormap title vmin vmax size }
     protected method Rotate {option x y}
-    protected method SendCmd {string}
-    protected method SendCmdNoWait {string}
     protected method Zoom {option}
 
@@ -113 +110 @@
 
     private variable _arcball ""
-    private variable _outbuf       ;    # buffer for outgoing commands
-
     private variable _dlist ""     ;    # list of data objects
     private variable _obj2datasets
@@ -135 +130 @@
     private variable _first ""     ;    # This is the topmost dataset.
     private variable _start 0
-    private variable _buffering 0
     private variable _title ""
     private variable _seeds
@@ -838 +832 @@
 }
 
-#
-# sendto --
-#
-itcl::body Rappture::VtkVolumeViewer::sendto { bytes } {
-    SendBytes "$bytes\n"
-    StartWaiting
-}
-
-#
-# SendCmd
-#
-#       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::VtkVolumeViewer::SendCmd {string} {
-    if { $_buffering } {
-        append _outbuf $string "\n"
-    } 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::VtkVolumeViewer::SendCmdNoWait {string} {
-    if { $_buffering } {
-        append _outbuf $string "\n"
-    } else {
-        SendBytes "$string\n"
-    }
-}
-
 # ----------------------------------------------------------------------
 # USAGE: ReceiveImage -bytes <size> -type <type> -token <token>
@@ -978 +933 @@
     # be preempted by a server disconnect/reconnect (which automatically
     # generates a new call to Rebuild).   
-    set _buffering 1
+    StartBufferingCommands
+
     set _legendPending 1
 
     if { $_reset } {
-        if 1 {
+        if { $_reportClientInfo }  {
             # Tell the server the name of the tool, the version, and dataset
             # that we are rendering.  Have to do it here because we don't know
@@ -1040 +996 @@
                 set bytes [$dataobj vtkdata $comp]
                 set length [string length $bytes]
-                if 1 { 
+                if { $_reportClientInfo }  {
                     set info {}
                     lappend info "tool_id"       [$dataobj hints toolId]
@@ -1136 +1092 @@
         set _reset 0
     }
-    set _buffering 0;                        # Turn off buffering.
-
     # Actually write the commands to the server socket.  If it fails, we don't
     # care.  We're finished here.
     blt::busy hold $itk_component(hull)
-    sendto $_outbuf;                        
+    StopBufferingCommands
     blt::busy release $itk_component(hull)
-    set _outbuf "";                        # Clear the buffer.                
 }