Changeset 5134 for trunk/gui/scripts/flowvisviewer.tcl

Timestamp:

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

Author:

ldelgass

Message:

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

File:

• trunk/gui/scripts/flowvisviewer.tcl (modified) (8 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
 }