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

Timestamp:

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

Author:

gah

Message:

push SendCmd? into base class w/ buffering

File:

• trunk/gui/scripts/nanovisviewer.tcl (modified) (11 diffs)

trunk/gui/scripts/nanovisviewer.tcl

@@ -77 +77 @@
     public method limits { tf }
     public method overmarker { m x }
-    public method sendto { string }
     public method parameters {title args} { 
         # do nothing 
@@ -98 +97 @@
     protected method ReceiveLegend { tf vmin vmax size }
     protected method Rotate {option x y}
-    protected method SendCmd {string}
     protected method SendTransferFuncs {}
     protected method Slice {option args}
@@ -124 +122 @@
     private variable _arcball ""
     private variable _useArcball 1
-    private variable _outbuf       ;# buffer for outgoing commands
 
     private variable _dlist ""     ;# list of data objects
@@ -149 +146 @@
     private variable _activeTfs
     private variable _first ""     ;# This is the topmost volume.
-    private variable _buffering 0
 
     # This 
@@ -190 +186 @@
     $_dispatcher register !resize
     $_dispatcher dispatch $this !resize "[itcl::code $this DoResize]; list"
-
-    set _outbuf ""
 
     #
@@ -644 +638 @@
 
     # disconnected -- no more data sitting on server
-    set _outbuf ""
     array unset _serverDatasets
 }
-
-#
-# sendto --
-#
-itcl::body Rappture::NanovisViewer::sendto { bytes } {
-    SendBytes "$bytes\n"
-}
-
-#
-# 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::NanovisViewer::SendCmd {string} {
-    if { $_buffering } {
-        append _outbuf $string "\n"
-    } else {
-        foreach line [split $string \n] {
-            SendEcho >>line $line
-        }
-        SendBytes "$string\n"
-    }
-}
-
 
 # ----------------------------------------------------------------------
@@ -878 +845 @@
     # be preempted by a server disconnect/reconnect (which automatically
     # generates a new call to Rebuild).   
-    set _buffering 1
+    StartBufferingCommands
 
     # Hide all the isomarkers. Can't remove them. Have to remember the
@@ -893 +860 @@
         set _height [winfo height $itk_component(3dview)]
         DoResize
-        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
@@ -923 +890 @@
                 set data [$dataobj values $cname]
                 set nbytes [string length $data]
-                if 1 {
+                if { $_reportClientInfo }  {
                     set info {}
                     lappend info "tool_id"       [$dataobj hints toolId]
@@ -934 +901 @@
                     SendCmd "clientinfo [list $info]"
                 }
-                append _outbuf "volume data follows $nbytes $tag\n"
+                SendCmd "volume data follows $nbytes $tag"
                 append _outbuf $data
                 set _recvdDatasets($tag) 1
@@ -1000 +967 @@
         }
     }
-    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)
-    SendBytes $_outbuf;                        
+    StopBufferingCommands
     blt::busy release $itk_component(hull)
     set _reset 0
-    set _outbuf "";                        # Clear the buffer.                
 }