Changeset 3421 for trunk/gui/scripts/vtkviewer.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/vtkviewer.tcl (modified) (14 diffs)

trunk/gui/scripts/vtkviewer.tcl

@@ -59 +59 @@
     public method isconnected {}
     public method limits { colormap }
-    public method sendto { string }
     public method parameters {title args} { 
         # do nothing 
@@ -79 +78 @@
     protected method ReceiveLegend { colormap title vmin vmax size }
     protected method Rotate {option x y}
-    protected method SendCmd {string}
     protected method Zoom {option}
 
@@ -109 +107 @@
 
     private variable _arcball ""
-    private variable _outbuf;           # buffer for outgoing commands
-
     private variable _dlist "";         # list of data objects
     private variable _allDataObjs
@@ -136 +132 @@
     private variable _first ""     ;# This is the topmost dataset.
     private variable _start 0
-    private variable _buffering 0
     private variable _title ""
 
@@ -176 +171 @@
     $_dispatcher register !rotate
     $_dispatcher dispatch $this !rotate "[itcl::code $this DoRotate]; list"
-
-    set _outbuf ""
 
     #
@@ -313 +306 @@
     Rappture::Tooltip::for $itk_component(zoomout) "Zoom out"
 
-    puts stderr "BuildMeshTab"
     if { [catch { BuildMeshTab } errs ]  != 0 } {
         puts stderr "errs=$errs"
     }
-    puts stderr "BuildMoleculeTab"
     if { [catch { BuildMoleculeTab } errs ]  != 0 } {
         global errorInfo
@@ -431 +422 @@
     set _start [clock clicks -milliseconds]
     SendCmd "screen size $_width $_height"
-    #SendCmd "imgflush"
-
     # Must reset camera to have object scaling to take effect.
-    #SendCmd "camera reset"
-    #SendCmd "camera zoom $_view(zoom)"
+    SendCmd "camera reset"
     set _resizePending 0
 }
@@ -755 +743 @@
 
     # disconnected -- no more data sitting on server
-    set _outbuf ""
     array unset _datasets 
     array unset _data 
     array unset _colormaps 
-}
-
-#
-# sendto --
-#
-itcl::body Rappture::VtkViewer::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::VtkViewer::SendCmd {string} {
-    if { $_buffering } {
-        append _outbuf $string "\n"
-    } else {
-        SendBytes "$string\n"
-    }
 }
 
@@ -878 +843 @@
     # be preempted by a server disconnect/reconnect (which automatically
     # generates a new call to Rebuild).   
-    set _buffering 1
+    StartBufferingCommands
 
     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
@@ -930 +895 @@
                 }
                 set length [string length $bytes]
-                if 1 {
+                if { $_reportClientInfo }  {
                     set info {}
                     lappend info "tool_id"       [$dataobj hints toolId]
@@ -941 +906 @@
                     SendCmd [list "clientinfo" $info]
                 }
-                append _outbuf "dataset add $tag data follows $length\n"
+                SendCmd "dataset add $tag data follows $length"
                 append _outbuf $bytes
                 set _datasets($tag) 1
@@ -988 +953 @@
     SendCmd "dataset maprange visible"
         
-    set _buffering 0;                        # Turn off buffering.
     set _reset 0
 
@@ -994 +958 @@
     # care.  We're finished here.
     blt::busy hold $itk_component(hull)
-    SendBytes $_outbuf;                        
+    StopBufferingCommands
     blt::busy release $itk_component(hull)
-    set _outbuf "";                        # Clear the buffer.                
 }
 
@@ -1589 +1552 @@
 #
 itcl::body Rappture::VtkViewer::BuildColormap { name styles } {
-    puts stderr name=$name
     if { $name ==  "elementDefault" } {
         return