Changeset 5096

Timestamp:

Mar 8, 2015 1:52:25 AM (6 years ago)

Author:

ldelgass

Message:

merge r5068:r5069 from trunk

Location:

branches/1.4

Files:

• . (modified) (1 prop)
• gui/scripts/visviewer.tcl (modified) (5 diffs)
• gui/scripts/vtkglyphviewer.tcl (modified) (1 diff)
• gui/scripts/vtkisosurfaceviewer.tcl (modified) (1 diff)
• gui/scripts/vtkstreamlinesviewer.tcl (modified) (2 diffs)
• gui/scripts/vtksurfaceviewer.tcl (modified) (1 diff)
• gui/scripts/vtkvolumeviewer.tcl (modified) (1 diff)

branches/1.4/gui/scripts/visviewer.tcl

@@ -57 +57 @@
     protected variable _debugConsole 0
     protected variable _reportClientInfo 1
+    # Number of milliscends to wait for server reply before displaying wait
+    # dialog.  If set to 0, dialog is never displayed.
     protected variable _waitTimeout 0
 
@@ -96 +98 @@
     protected method SendBytes { bytes }
     protected method SendCmd {string}
-    protected method SendCmdNoWait {string}
     protected method SendEcho { channel {data ""} }
     protected method StartBufferingCommands {}
@@ -478 +479 @@
 # StartWaiting --
 #
-#    Read some number of bytes from the visualization server.
-#
-
+#    Display a waiting dialog after a timeout has passed
+#
 itcl::body Rappture::VisViewer::StartWaiting {} {
     if { $_waitTimeout > 0 } {
@@ -488 +488 @@
 }
 
+#
+# StopWaiting --
+#
+#    Take down waiting dialog
+#
 itcl::body Rappture::VisViewer::StopWaiting {} {
     if { $_waitTimeout > 0 } {
@@ -1180 +1185 @@
     }
 }
-
-#
-# 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} {
-    if { $_buffering } {
-        append _outbuf $string "\n"
-    } else {
-        SendBytes "$string\n"
-    }
-}

branches/1.4/gui/scripts/vtkglyphviewer.tcl

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

branches/1.4/gui/scripts/vtkisosurfaceviewer.tcl

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

branches/1.4/gui/scripts/vtkstreamlinesviewer.tcl

@@ -1239 +1239 @@
 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"
     }
 }
@@ -1523 +1523 @@
         foreach {dataobj comp} [split $dataset -] break
         if { [info exists _dataset2style($dataset)] } {
-            SendCmdNoWait \
+            SendCmd \
                 "legend $_dataset2style($dataset) $_colorMode $_curFldName {} $w $h 0"
             break;

branches/1.4/gui/scripts/vtksurfaceviewer.tcl

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

branches/1.4/gui/scripts/vtkvolumeviewer.tcl

@@ -1541 +1541 @@
         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"