Changeset 5134 for trunk

Timestamp:

Mar 14, 2015 1:50:46 AM (9 years ago)

Author:

ldelgass

Message:

Use SendData? method to send binary data in viewers, make _outbuf private in
superclass.

Location:

trunk/gui/scripts

Files:

• flowvisviewer.tcl (modified) (8 diffs)
• mapviewer.tcl (modified) (1 diff)
• molvisviewer.tcl (modified) (3 diffs)
• nanovisviewer.tcl (modified) (1 diff)
• visviewer.tcl (modified) (2 diffs)
• vtkglyphviewer.tcl (modified) (2 diffs)
• vtkheightmapviewer.tcl (modified) (1 diff)
• vtkimageviewer.tcl (modified) (1 diff)
• vtkisosurfaceviewer.tcl (modified) (2 diffs)
• vtkmeshviewer.tcl (modified) (1 diff)
• vtkstreamlinesviewer.tcl (modified) (2 diffs)
• vtksurfaceviewer.tcl (modified) (2 diffs)
• vtkviewer.tcl (modified) (2 diffs)
• vtkvolumeviewer.tcl (modified) (2 diffs)

trunk/gui/scripts/flowvisviewer.tcl

@@ -91 +91 @@
     private method EventuallyGoto { nSteps }
     private method EventuallyResizeLegend { }
-    private method FlowCmd { dataobj comp nbytes extents }
     private method GetDatasetsWithComponent { cname }
     private method GetFlowInfo { widget }
@@ -112 +111 @@
     private method ResizeLegend {}
     private method Rotate {option x y}
+    private method SendFlowCmd { dataobj comp nbytes extents }
     private method SendTransferFuncs {}
     private method SetOrientation { side }
@@ -1174 +1174 @@
                 SendCmd "volume data follows $nbytes $tag"
             } else {
-                set cmd [FlowCmd $dataobj $comp $nbytes $extents]
-                if { $cmd == "" } {
-                    puts stderr "no command"
-                    continue
+                if {[SendFlowCmd $dataobj $comp $nbytes $extents] < 0} {
+                     continue
                 }
-                append _outbuf $cmd
-            }
-            append _outbuf $data
+            }
+            SendData $data
             NameTransferFunc $dataobj $comp
             set _recvObjs($tag) 1
@@ -2614 +2611 @@
 }
 
-itcl::body Rappture::FlowvisViewer::FlowCmd { dataobj comp nbytes extents } {
+itcl::body Rappture::FlowvisViewer::SendFlowCmd { dataobj comp nbytes extents } {
     set tag "$dataobj-$comp"
     if { ![info exists _obj2flow($tag)] } {
-        append cmd "flow add $tag\n"
-        append cmd "$tag data follows $nbytes $extents\n"
-        return $cmd
+        SendCmd "flow add $tag"
+        SendCmd "$tag data follows $nbytes $extents"
+        return 0
     }
     set flowobj $_obj2flow($tag)
     if { $flowobj == "" } {
         puts stderr "no flowobj"
-        return ""
-    }
-    set cmd {}
-    append cmd "if {\[flow exists $tag\]} {flow delete $tag}\n"
+        return -1
+    }
+    SendCmd "if {\[flow exists $tag\]} {flow delete $tag}"
     array set info  [$flowobj hints]
     set _settings($this-volume) $info(volume)
@@ -2634 +2630 @@
     set _settings($this-duration) $info(duration)
     $itk_component(speed) value $info(speed)
+    set cmd {}
     append cmd "flow add $tag"
     append cmd " -position $info(position)"
@@ -2640 +2637 @@
     append cmd " -outline $info(outline)"
     append cmd " -slice $info(streams)"
-    append cmd " -arrows $info(arrows)\n"
+    append cmd " -arrows $info(arrows)"
+    SendCmd $cmd
     foreach part [$flowobj particles] {
+        set cmd {}
         array unset info
         array set info $part
@@ -2650 +2649 @@
         append cmd " -axis $info(axis)"
         append cmd " -color {$color}"
-        append cmd " -size $info(size)\n"
+        append cmd " -size $info(size)"
+        SendCmd $cmd
     }
     foreach box [$flowobj boxes] {
+        set cmd {}
         array unset info
         set info(corner1) ""
@@ -2666 +2667 @@
         append cmd " -linewidth $info(linewidth) "
         append cmd " -corner1 {$info(corner1)} "
-        append cmd " -corner2 {$info(corner2)}\n"
-    }
-    append cmd "$tag data follows $nbytes $extents\n"
-    return $cmd
+        append cmd " -corner2 {$info(corner2)}"
+        SendCmd $cmd
+    }
+    SendCmd "$tag data follows $nbytes $extents"
+    return 0
 }
 

trunk/gui/scripts/mapviewer.tcl

@@ -1164 +1164 @@
                 set length [string length $bytes]
                 SendCmd "map load data follows $length"
-                append _outbuf $bytes
+                SendData $bytes
             } else {
                 if { [info exists _mapsettings(style)] } {

trunk/gui/scripts/molvisviewer.tcl

@@ -966 +966 @@
                 # with the data payload immediately afterwards.
                 ServerCmd "loadpdb -defer follows $model $state $numBytes"
-                append _outbuf $data1
+                SendData $data1
                 set _dataobjs($model-$state)  1
             }
@@ -979 +979 @@
                 # with the data payload immediately afterwards.
                 ServerCmd "loadpdb -defer follows $model $state $numBytes"
-                append _outbuf $data2
+                SendData $data2
                 set _dataobjs($model-$state)  1
             }
@@ -1028 +1028 @@
                     # command with the data payload immediately afterwards.
                     ServerCmd "loadpdb -defer follows $model $state $numBytes"
-                    append _outbuf $data3
+                    SendData $data3
                 }
                 set _dataobjs($model-$state) 1

trunk/gui/scripts/nanovisviewer.tcl

@@ -950 +950 @@
                 }
                 SendCmd "volume data follows $nbytes $tag"
-                append _outbuf $data
+                SendData $data
                 set _recvdDatasets($tag) 1
                 set _serverDatasets($tag) 0

trunk/gui/scripts/visviewer.tcl

@@ -30 +30 @@
     private common _done            ;   # Used to indicate status of send.
     private variable _buffer        ;   # buffer for incoming/outgoing commands
+    private variable _outbuf       ;    # buffer for outgoing commands
     private variable _blockOnWrite 0;   # Should writes to socket block?
     private variable _initialized
@@ -47 +48 @@
     protected variable _sid ""      ;   # socket connection to server
     protected variable _maxConnects 100
-    protected variable _outbuf       ;    # buffer for outgoing commands
     protected variable _buffering 0
     protected variable _cmdSeq 0     ;    # Command sequence number

trunk/gui/scripts/vtkglyphviewer.tcl

@@ -837 +837 @@
     $_dispatcher cancel !legend
     # disconnected -- no more data sitting on server
-    set _outbuf ""
     array unset _datasets 
     array unset _data 
@@ -1000 +999 @@
                 }
                 SendCmd "dataset add $tag data follows $length"
-                append _outbuf $bytes
+                SendData $bytes
                 set _datasets($tag) 1
                 SetObjectStyle $dataobj $comp

trunk/gui/scripts/vtkheightmapviewer.tcl

@@ -1002 +1002 @@
                 }
                 SendCmd "dataset add $tag data follows $length"
-                append _outbuf $bytes
+                SendData $bytes
                 set _datasets($tag) 1
                 SetObjectStyle $dataobj $comp

trunk/gui/scripts/vtkimageviewer.tcl

@@ -980 +980 @@
                 }
                 SendCmd "dataset add $tag data follows $length"
-                append _outbuf $bytes
+                SendData $bytes
                 set _datasets($tag) 1
                 SetObjectStyle $dataobj $comp

trunk/gui/scripts/vtkisosurfaceviewer.tcl

@@ -949 +949 @@
     $_dispatcher cancel !legend
     # disconnected -- no more data sitting on server
-    set _outbuf ""
     array unset _datasets
     array unset _data
@@ -1112 +1111 @@
                 }
                 SendCmd "dataset add $tag data follows $length"
-                append _outbuf $bytes
+                SendData $bytes
                 set _datasets($tag) 1
                 SetObjectStyle $dataobj $comp

trunk/gui/scripts/vtkmeshviewer.tcl

@@ -867 +867 @@
             }
             SendCmd "dataset add $tag data follows $length"
-            append _outbuf $bytes
+            SendData $bytes
             set _datasets($tag) 1
             SetObjectStyle $dataobj

trunk/gui/scripts/vtkstreamlinesviewer.tcl

@@ -1008 +1008 @@
                 }
                 SendCmd "dataset add $tag data follows $length"
-                append _outbuf $bytes
+                SendData $bytes
                 set _datasets($tag) 1
                 SetObjectStyle $dataobj $comp
@@ -2165 +2165 @@
         set length [string length $seeds]
         SendCmd "streamlines seed fmesh 200 data follows $length $tag"
-        append _outbuf $seeds
+        SendData $seeds
         set _seeds($dataobj) 1
     }

trunk/gui/scripts/vtksurfaceviewer.tcl

@@ -784 +784 @@
     $_dispatcher cancel !legend
     # disconnected -- no more data sitting on server
-    set _outbuf ""
     array unset _datasets
     array unset _data
@@ -947 +946 @@
                 }
                 SendCmd "dataset add $tag data follows $length"
-                append _outbuf $bytes
+                SendData $bytes
                 set _datasets($tag) 1
                 SetObjectStyle $dataobj $comp

trunk/gui/scripts/vtkviewer.tcl

@@ -926 +926 @@
 
     # disconnected -- no more data sitting on server
-    set _outbuf ""
     array unset _datasets
     array unset _data
@@ -1084 +1083 @@
                 }
                 SendCmd "dataset add $tag data follows $length"
-                append _outbuf $bytes
+                SendData $bytes
                 set _datasets($tag) 1
                 SetObjectStyle $dataobj $comp

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ -884 +884 @@
     $_dispatcher cancel !legend
     # disconnected -- no more data sitting on server
-    set _outbuf ""
     array unset _datasets 
     array unset _data 
@@ -1065 +1064 @@
                 }
                 SendCmd "dataset add $tag data follows $length"
-                append _outbuf $bytes
+                SendData $bytes
                 set _datasets($tag) 1
                 SetObjectStyle $dataobj $comp