Changeset 5068

Timestamp:

Mar 4, 2015 12:37:57 PM (9 years ago)

Author:

ldelgass

Message:

Change uses of SendCmdNoWait? to SendCmd?. We don't currently have (or need) a
true out-of-band send.

Location:

trunk/gui/scripts

Files:

• visviewer.tcl (modified) (2 diffs)
• vtkglyphviewer.tcl (modified) (1 diff)
• vtkisosurfaceviewer.tcl (modified) (1 diff)
• vtkstreamlinesviewer.tcl (modified) (2 diffs)
• vtksurfaceviewer.tcl (modified) (1 diff)
• vtkvolumeviewer.tcl (modified) (1 diff)

trunk/gui/scripts/visviewer.tcl

@@ -99 +99 @@
     protected method SendBytes { bytes }
     protected method SendCmd {string}
-    protected method SendCmdNoWait {string}
     protected method SendEcho { channel {data ""} }
     protected method StartBufferingCommands {}
@@ -1201 +1200 @@
     }
 }
-
-#
-# 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::VisViewer::SendCmdNoWait {string} {
-    incr _cmdSeq
-    if {$_trace} {
-        puts stderr "$_cmdSeq>>[string range $string 0 70]"
-    }
-    if { $_buffering } {
-        append _outbuf $string "\n"
-    } else {
-        SendBytes "$string\n"
-    }
-}

trunk/gui/scripts/vtkglyphviewer.tcl

@@ -1562 +1562 @@
     if { $_currentColormap != ""  } {
         set cmap $_currentColormap
-        SendCmdNoWait "legend $cmap $_colorMode $_curFldName {} $w $h 0"
+        SendCmd "legend $cmap $_colorMode $_curFldName {} $w $h 0"
     }
 }

trunk/gui/scripts/vtkisosurfaceviewer.tcl

@@ -1663 +1663 @@
     if { $_currentColormap != ""  } {
         set cmap $_currentColormap
-        SendCmdNoWait "legend $cmap scalar $_curFldName {} $w $h 0"
+        SendCmd "legend $cmap scalar $_curFldName {} $w $h 0"
     }
 }

trunk/gui/scripts/vtkstreamlinesviewer.tcl

@@ -1238 +1238 @@
 itcl::body Rappture::VtkStreamlinesViewer::Pick {x y} {
     foreach tag [CurrentDatasets -visible] {
-        SendCmdNoWait "dataset getscalar pixel $x $y $tag"
+        SendCmd "dataset getscalar pixel $x $y $tag"
     }
 }
@@ -1522 +1522 @@
         foreach {dataobj comp} [split $dataset -] break
         if { [info exists _dataset2style($dataset)] } {
-            SendCmdNoWait \
+            SendCmd \
                 "legend $_dataset2style($dataset) $_colorMode $_curFldName {} $w $h 0"
             break;

trunk/gui/scripts/vtksurfaceviewer.tcl

@@ -1475 +1475 @@
     if { $_currentColormap != ""  } {
         set cmap $_currentColormap
-        SendCmdNoWait "legend $cmap scalar $_curFldName {} $w $h 0"
+        SendCmd "legend $cmap scalar $_curFldName {} $w $h 0"
     }
 }

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ -1640 +1640 @@
         foreach {dataobj comp} [split $dataset -] break
         if { [info exists _dataset2style($dataset)] } {
-            SendCmdNoWait \
+            SendCmd \
                 "legend2 $_dataset2style($dataset) $w $h"
                 #"legend $_dataset2style($dataset) $_colorMode $_curFldName {} $w $h 0"