Changeset 3947

Timestamp:

Sep 22, 2013 1:49:00 PM (11 years ago)

Author:

ldelgass

Message:

Remove unused method/event, send VTK data when blob isn't defined: we should
probably use the type method of the dataobj, but this method isn't currently
reliable or well-defined: is it the incoming type of data or the outgoing,
converted type of data? What is the enum of possible values?

File:

• trunk/gui/scripts/flowvisviewer.tcl (modified) (7 diffs)

trunk/gui/scripts/flowvisviewer.tcl

@@ -90 +90 @@
     protected method ReceiveLegend { tf vmin vmax size }
     protected method Rotate {option x y}
-    protected method SendDataObjs {}
     protected method SendTransferFuncs {}
     protected method Slice {option args}
@@ -136 +135 @@
     private variable _serverObjs   ;# maps dataobj-component to volume ID 
                                     # in the server
-    private variable _sendobjs ""  ;# list of data objs to send to server
     private variable _recvObjs  ;# list of data objs to send to server
     private variable _obj2style    ;# maps dataobj-component to transfunc
@@ -182 +180 @@
     $_dispatcher register !legend
     $_dispatcher dispatch $this !legend "[itcl::code $this ResizeLegend]; list"
-
-    # Send dataobjs event
-    $_dispatcher register !send_dataobjs
-    $_dispatcher dispatch $this !send_dataobjs \
-        "[itcl::code $this SendDataObjs]; list"
 
     # Send transferfunctions event
@@ -584 +577 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::FlowvisViewer::destructor {} {
-    set _sendobjs ""  ;# stop any send in progress
     $_dispatcher cancel !rebuild
-    $_dispatcher cancel !send_dataobjs
     $_dispatcher cancel !send_transfunc
     image delete $_image(plot)
@@ -955 +946 @@
     # disconnected -- no more data sitting on server
     array unset _serverObjs
-    set _sendobjs ""
-}
-
-# ----------------------------------------------------------------------
-# USAGE: SendDataObjs
-#
-# Used internally to send a series of volume objects off to the
-# server.  Sends each object, a little at a time, with updates in
-# between so the interface doesn't lock up.
-# ----------------------------------------------------------------------
-itcl::body Rappture::FlowvisViewer::SendDataObjs {} {
-    blt::busy hold $itk_component(hull)
-    foreach dataobj $_sendobjs {
-        foreach comp [$dataobj components] {
-            # Send the data as one huge base64-encoded mess -- yuck!
-            set data [$dataobj blob $comp]
-            set nbytes [string length $data]
-            set extents [$dataobj extents $comp]
-
-            # I have a field. Is a vector field or a volume field?
-            if { $extents == 1 } {
-                set cmd "volume data follows $nbytes $dataobj-$comp\n"
-            } else {
-                set cmd [FlowCmd $dataobj $comp $nbytes $extents]
-                if { $cmd == "" } {
-                    puts stderr "no command"
-                    continue
-                }
-            }
-            f { ![SendBytes $cmd] } {
-                puts stderr "can't send"
-                return
-            }
-            if { ![SendBytes $data] } {
-                puts stderr "can't send"
-                return
-            }
-            NameTransferFunc $dataobj $comp
-            set _recvObjs($dataobj-$comp) 1
-        }
-    }
-    set _sendobjs ""
-    blt::busy release $itk_component(hull)
-
-    # Turn on buffering of commands to the server.  We don't want to
-    # be preempted by a server disconnect/reconnect (which automatically
-    # generates a new call to Rebuild).   
-    StartBufferingCommands
-
-    # activate the proper volume
-    set _first [lindex [get] 0]
-    if { "" != $_first } {
-        set axis [$_first hints updir]
-        if {"" != $axis} {
-            SendCmd "up $axis"
-        }
-
-        if 0 {
-        set location [$_first hints camera]
-        if { $location != "" } {
-            array set _view $location
-        }
-        set _settings($this-qw)    $_view(qw)
-        set _settings($this-qx)    $_view(qx)
-        set _settings($this-qy)    $_view(qy)
-        set _settings($this-qz)    $_view(qz)
-        set _settings($this-xpan)  $_view(xpan)
-        set _settings($this-ypan)  $_view(ypan)
-        set _settings($this-zoom)  $_view(zoom)
-        set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
-        $_arcball quaternion $q
-        SendCmd "camera orient $q"
-        SendCmd "camera reset"
-        PanCamera
-        SendCmd "camera zoom $_view(zoom)"
-        }
-        # The active transfer function is by default the first component of
-        # the first data object.  This assumes that the data is always
-        # successfully transferred.
-        set comp [lindex [$_first components] 0]
-        set _activeTf [lindex $_obj2style($_first-$comp) 0]
-    }
-
-    SendCmd "flow reset"
-    StopBufferingCommands
 }
 
@@ -1248 +1154 @@
         foreach comp [$dataobj components] {
             set tag $dataobj-$comp
-            # Send the data as one huge base64-encoded mess -- yuck!
-            set data [$dataobj blob $comp]
+            set isvtk 0
+            # FIXME: Would like to use the type method of the dataobj
+            # but the returned value isn't well defined now
+            if {[catch {
+                # Send the data as one huge base64-encoded mess -- yuck!
+                set data [$dataobj blob $comp]
+            }]} {
+                set data [$dataobj vtkdata $comp]
+                set isvtk 1
+            }
             set nbytes [string length $data]
             if { $_reportClientInfo }  {
@@ -1264 +1178 @@
             set extents [$dataobj extents $comp]
             # I have a field. Is a vector field or a volume field?
-            if { $extents == 1 } {
+            if { !$isvtk && $extents == 1 } {
                 set cmd "volume data follows $nbytes $tag\n"
             } else {