Changeset 5643

Timestamp:

May 31, 2015, 6:09:46 PM (9 years ago)

Author:

ldelgass

Message:

merge r5642 from trunk

Location:

branches/1.4

Files:

• . (modified) (1 prop)
• gui/scripts/flowvisviewer.tcl (modified) (17 diffs)
• gui/scripts/nanovisviewer.tcl (modified) (15 diffs)

branches/1.4/gui/scripts/flowvisviewer.tcl

@@ -129 +129 @@
     private variable _dlist ""         ;# list of data objects
     private variable _obj2ovride       ;# maps dataobj => style override
-    private variable _serverDatasets   ;# contains all the dataobj-component
+    private variable _datasets         ;# contains all the dataobj-component
                                        ;# to volumes in the server
-    private variable _recvdDatasets    ;# list of data objs to send to server
     private variable _dataset2style    ;# maps dataobj-component to transfunc
     private variable _style2datasets   ;# maps tf back to list of
@@ -223 +222 @@
     $_arcball quaternion [ViewToQuaternion]
 
-    set _limits(v) [list 0.0 1.0]
     set _reset 1
 
@@ -590 +588 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::FlowvisViewer::add {dataobj {settings ""}} {
+    if { ![$dataobj isvalid] } {
+        return;                         # Object doesn't contain valid data.
+    }
     array set params {
         -color auto
@@ -695 +696 @@
         if { $pos >= 0 } {
             set _dlist [lreplace $_dlist $pos $pos]
-            array unset _limits $dataobj-*
             array unset _obj2ovride $dataobj-*
-            array unset _dataset2flow $dataobj-*
-            array unset _serverDatasets $dataobj-*
-            array unset _dataset2style $dataobj-*
             set changed 1
         }
@@ -705 +702 @@
     # If anything changed, then rebuild the plot
     if {$changed} {
-        # Repair the reverse lookup
-        foreach tf [array names _style2datasets] {
-            set list {}
-            foreach {dataobj cname} $_style2datasets($tf) break
-            if { [info exists _serverDatasets($dataobj-$cname)] } {
-                lappend list $dataobj $cname
-            }
-            if { $list == "" } {
-                array unset _style2datasets $tf
-            } else {
-                set _style2datasets($tf) $list
-            }
-        }
         $_dispatcher event -idle !rebuild
     }
@@ -755 +739 @@
             set _limits($cname) $limits(v)
         }
-        foreach axis {x y z v} {
+        foreach axis {x y z} {
             foreach { min max } [$dataobj limits $axis] break
             if {"" != $min && "" != $max} {
@@ -831 +815 @@
                 }
                 default {
-                    error "bad download format $_downloadPopup(format)"
+                    error "bad download format \"$_downloadPopup(format)\""
                 }
             }
@@ -914 +898 @@
 
     # disconnected -- no more data sitting on server
-    array unset _serverDatasets
+    array unset _datasets
 }
 
@@ -964 +948 @@
     array set info $args
     set bytes [ReceiveBytes $info(-bytes)]
-    ReceiveEcho <<line "<read $info(-bytes) bytes"
-    switch -- $info(-type)  {
+    switch -- $info(-type) {
         "image" {
+            #puts stderr "received image [image width $_image(plot)]x[image height $_image(plot)]"
             $_image(plot) configure -data $bytes
-            #puts stderr "image received [image width $_image(plot)] by [image height $_image(plot)]"
         }
         "print" {
@@ -979 +962 @@
         }
         default {
-            puts stderr "unknown download type $info(-type)"
+            puts stderr "unknown image type $info(-type)"
         }
     }
@@ -1055 +1038 @@
 #       The procedure is the response from the render server to each "data
 #       follows" command.  The server sends back a "data" command invoked our
-#       the slave interpreter.  The purpose is to collect the min/max of the
-#       volume sent to the render server.  Since the client (flowvisviewer)
-#       doesn't parse 3D data formats, we rely on the server (nanovis) to
-#       tell us what the limits are.  Once we've received the limits to all
-#       the data we've sent (tracked by _recvdDatasets) we can then determine
-#       what the transfer functions are for these volumes.
-#
-#
-#       Note: There is a considerable tradeoff in having the server report
-#             back what the data limits are.  It means that much of the code
-#             having to do with transfer-functions has to wait for the data
-#             to come back, since the isomarkers are calculated based upon
-#             the data limits.  The client code is much messier because of
-#             this.  The alternative is to parse any of the 3D formats on the
-#             client side.
+#       the slave interpreter.  The purpose was to collect the min/max of the
+#       volume sent to the render server.  This is no longer needed since we
+#       already know the limits.
 #
 itcl::body Rappture::FlowvisViewer::ReceiveData { args } {
@@ -1080 +1051 @@
 
     set tag $info(tag)
-    set parts [split $tag -]
-
-    #
-    # Volumes don't exist until we're told about them.
-    #
-    set dataobj [lindex $parts 0]
-    set _serverDatasets($tag) 0
     set _limits($tag) [list $info(min) $info(max)]
-
-    unset _recvdDatasets($tag)
-    if { [array size _recvdDatasets] == 0 } {
-        updateTransferFunctions
-    }
 }
 
@@ -1133 +1092 @@
 
     set _first ""
-    foreach dataobj [get] {
+    foreach dataobj [get -objects] {
+        if { [info exists _obj2ovride($dataobj-raise)] &&  $_first == "" } {
+            set _first $dataobj
+        }
         foreach cname [$dataobj components] {
             set tag $dataobj-$cname
-            if {[$dataobj type] == "dx"} {
-                set data [$dataobj blob $cname]
-            } else {
-                set data [$dataobj vtkdata $cname]
-            }
-            set nbytes [string length $data]
-            if { $_reportClientInfo }  {
-                set info {}
-                lappend info "tool_id"       [$dataobj hints toolid]
-                lappend info "tool_name"     [$dataobj hints toolname]
-                lappend info "tool_title"    [$dataobj hints tooltitle]
-                lappend info "tool_command"  [$dataobj hints toolcommand]
-                lappend info "tool_revision" [$dataobj hints toolrevision]
-                lappend info "dataset_label" [$dataobj hints label]
-                lappend info "dataset_size"  $nbytes
-                lappend info "dataset_tag"   $tag
-                SendCmd "clientinfo [list $info]"
-            }
-            set numComponents [$dataobj numComponents $cname]
-            # I have a field. Is a vector field or a volume field?
-            if { $numComponents == 1 } {
-                SendCmd "volume data follows $nbytes $tag"
-            } else {
-                if {[SendFlowCmd $dataobj $cname $nbytes $numComponents] < 0} {
-                    continue
+            if { ![info exists _datasets($tag)] } {
+                if { [$dataobj type] == "dx" } {
+                    set data [$dataobj blob $cname]
+                } else {
+                    set data [$dataobj vtkdata $cname]
                 }
-            }
-            SendData $data
-            NameTransferFunction $dataobj $cname
-            set _recvdDatasets($tag) 1
-        }
-    }
-
-    set _first [lindex [get] 0]
+                set nbytes [string length $data]
+                if { $_reportClientInfo }  {
+                    set info {}
+                    lappend info "tool_id"       [$dataobj hints toolid]
+                    lappend info "tool_name"     [$dataobj hints toolname]
+                    lappend info "tool_title"    [$dataobj hints tooltitle]
+                    lappend info "tool_command"  [$dataobj hints toolcommand]
+                    lappend info "tool_revision" [$dataobj hints toolrevision]
+                    lappend info "dataset_label" [$dataobj hints label]
+                    lappend info "dataset_size"  $nbytes
+                    lappend info "dataset_tag"   $tag
+                    SendCmd "clientinfo [list $info]"
+                }
+                set numComponents [$dataobj numComponents $cname]
+                # I have a field. Is a vector field or a volume field?
+                if { $numComponents == 1 } {
+                    SendCmd "volume data follows $nbytes $tag"
+                } else {
+                    if {[SendFlowCmd $dataobj $cname $nbytes $numComponents] < 0} {
+                        continue
+                    }
+                }
+                SendData $data
+                set _datasets($tag) 1
+                NameTransferFunction $dataobj $cname
+            }
+        }
+    }
 
     # Turn off cutplanes for all volumes
@@ -1176 +1138 @@
     }
 
-    # Reset the camera and other view parameters
-    InitSettings -axesvisible -gridvisible \
-        -opacity -light2side -isosurfaceshading \
-        -light \
-        -volume -outlinevisible -cutplanesvisible \
+    InitSettings -volume -outlinevisible -cutplanesvisible \
         -xcutplanevisible -ycutplanevisible -zcutplanevisible \
         -xcutplaneposition -ycutplaneposition -zcutplaneposition
 
-    # nothing to send -- activate the proper volume
+    if { $_reset } {
+        InitSettings -axesvisible -gridvisible \
+            -opacity -light2side -isosurfaceshading \
+            -light
+
+        #
+        # Reset the camera and other view parameters
+        #
+        if {"" != $_first} {
+            set axis [$_first hints updir]
+            if { "" != $axis } {
+                SendCmd "up $axis"
+            }
+            set location [$_first hints camera]
+            if { $location != "" } {
+                array set _view $location
+            }
+        }
+        set _settings(-qw)    $_view(-qw)
+        set _settings(-qx)    $_view(-qx)
+        set _settings(-qy)    $_view(-qy)
+        set _settings(-qz)    $_view(-qz)
+        set _settings(-xpan)  $_view(-xpan)
+        set _settings(-ypan)  $_view(-ypan)
+        set _settings(-zoom)  $_view(-zoom)
+
+        set q [ViewToQuaternion]
+        $_arcball quaternion $q
+        SendCmd "camera orient $q"
+        SendCmd "camera reset"
+        PanCamera
+        SendCmd "camera zoom $_view(-zoom)"
+    }
+
     if {"" != $_first} {
-        set axis [$_first hints updir]
-        if {"" != $axis} {
-            SendCmd "up $axis"
-        }
-        set location [$_first hints camera]
-        if { $location != "" } {
-            array set _view $location
-        }
-    }
-    set _settings(-qw)    $_view(-qw)
-    set _settings(-qx)    $_view(-qx)
-    set _settings(-qy)    $_view(-qy)
-    set _settings(-qz)    $_view(-qz)
-    set _settings(-xpan)  $_view(-xpan)
-    set _settings(-ypan)  $_view(-ypan)
-    set _settings(-zoom)  $_view(-zoom)
-
-    set q [ViewToQuaternion]
-    $_arcball quaternion $q
-    SendCmd "camera orient $q"
-    SendCmd "camera reset"
-    PanCamera
-    SendCmd "camera zoom $_view(-zoom)"
-
-    foreach dataobj [get] {
-        foreach cname [$dataobj components] {
-            NameTransferFunction $dataobj $cname
-        }
-    }
-
-    # nothing to send -- activate the proper ivol
-    set _first [lindex [get] 0]
-    if {"" != $_first} {
-        set axis [$_first hints updir]
-        if {"" != $axis} {
-            SendCmd "up $axis"
-        }
-        set location [$_first hints camera]
-        if { $location != "" } {
-            array set _view $location
-        }
         set cname [lindex [$_first components] 0]
         set _activeTf [lindex $_dataset2style($_first-$cname) 0]
-    }
-
-    # sync the state of slicers
-    set vols [CurrentDatasets -cutplanes]
-    foreach axis {x y z} {
-        set pos [expr {0.01*$_settings(-${axis}cutplaneposition)}]
-        SendCmd "cutplane position $pos $axis $vols"
-    }
-    SendCmd "volume data state $_settings(-volume)"
-    EventuallyRedrawLegend
+        # Make sure we display the proper transfer function in the legend.
+        updateTransferFunctions
+    }
 
     # Actually write the commands to the server socket.  If it fails, we don't
@@ -1256 +1199 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::FlowvisViewer::CurrentDatasets {{what -all}} {
-    return ""
+    set rlist ""
     if { $_first == "" } {
         return
     }
-    foreach tag [array names _serverDatasets *-*] {
-        if {[string match $_first-* $tag]} {
+    foreach cname [$_first components] {
+        set tag $_first-$cname
+        if { [info exists _datasets($tag)] && $_datasets($tag) } {
             array set style {
                 -cutplanes 1
             }
-            foreach {dataobj cname} [split $tag -] break
-            array set style [lindex [$dataobj components -style $cname] 0]
-            if {$what != "-cutplanes" || $style(-cutplanes)} {
-                lappend rlist $_serverDatasets($tag)
+            array set style [lindex [$_first components -style $cname] 0]
+            if { $what != "-cutplanes" || $style(-cutplanes) } {
+                lappend rlist $tag
             }
         }
@@ -1916 +1859 @@
 
 itcl::body Rappture::FlowvisViewer::limits { cname } {
-    set _limits(v) [list 0.0 1.0]
-    if { ![info exists _style2datasets($cname)] } {
-        puts stderr "no _style2datasets for cname=($cname)"
-        return [array get _limits]
-    }
-    set min ""; set max ""
-    foreach tag [GetDatasetsWithComponent $cname] {
-        if { ![info exists _serverDatasets($tag)] } {
-            puts stderr "$tag not in _serverDatasets?"
-            continue
-        }
-        if { ![info exists _limits($tag)] } {
-            puts stderr "$tag no min?"
-            continue
-        }
-        foreach {vmin vmax} $_limits($tag) break
-        if { $min == "" || $min > $vmin } {
-            set min $vmin
-        }
-        if { $max == "" || $max < $vmax } {
-            set max $vmax
-        }
-    }
-    if { $min != "" && $max != "" } {
-        set _limits(v) [list $min $max]
-        set _limits($cname) [list $min $max]
+    if { ![info exists _limits($cname)] } {
+        puts stderr "no limits for cname=($cname)"
+        return [list 0.0 1.0]
     }
     return $_limits($cname)
@@ -2974 +2894 @@
     set list ""
     foreach tag $_volcomponents($cname) {
-        if { ![info exists _serverDatasets($tag)] } {
+        if { ![info exists _datasets($tag)] } {
             continue
         }

branches/1.4/gui/scripts/nanovisviewer.tcl

@@ -121 +121 @@
     private variable _dlist ""         ;# list of data objects
     private variable _obj2ovride       ;# maps dataobj => style override
-    private variable _serverDatasets   ;# contains all the dataobj-component
+    private variable _datasets         ;# contains all the dataobj-component
                                        ;# to volumes in the server
-    private variable _recvdDatasets    ;# list of data objs to send to server
 
     private variable _reset 1          ;# Connection to server has been reset.
@@ -196 +195 @@
     $_arcball quaternion [ViewToQuaternion]
 
-    set _limits(v) [list 0.0 1.0]
     set _reset 1
 
@@ -342 +340 @@
     bind $itk_component(3dview) <ButtonRelease-1> \
         [itcl::code $this Rotate release %x %y]
+
     bind $itk_component(3dview) <Configure> \
         [itcl::code $this EventuallyResize %w %h]
@@ -560 +559 @@
             set _limits($cname) $limits(v)
         }
-        foreach axis {x y z v} {
+        foreach axis {x y z} {
             foreach { min max } [$dataobj limits $axis] break
             if {"" != $min && "" != $max} {
@@ -629 +628 @@
                     return [$this GetVtkData [lindex $args 0]]
                 }
-            }
-            return ""
+                default {
+                    error "bad download format \"$_downloadPopup(format)\""
+                }
+            }
         }
         default {
@@ -711 +712 @@
 
     # disconnected -- no more data sitting on server
-    array unset _serverDatasets
+    array unset _datasets
 }
 
@@ -739 +740 @@
     array set info $args
     set bytes [ReceiveBytes $info(-bytes)]
-    ReceiveEcho <<line "<read $info(-bytes) bytes"
-    if { $info(-type) == "image" } {
-        ReceiveEcho "for [image width $_image(plot)]x[image height $_image(plot)] image>"
-        $_image(plot) configure -data $bytes
-    } elseif { $info(-type) == "print" } {
-        set tag $this-print-$info(-token)
-        set _hardcopy($tag) $bytes
+    switch -- $info(-type) {
+        "image" {
+            #puts stderr "received image [image width $_image(plot)]x[image height $_image(plot)]"
+            $_image(plot) configure -data $bytes
+        }
+        "print" {
+            set tag $this-print-$info(-token)
+            set _hardcopy($tag) $bytes
+        }
+        default {
+            puts stderr "unknown image type $info(-type)"
+        }
     }
 }
@@ -820 +826 @@
 #       The procedure is the response from the render server to each "data
 #       follows" command.  The server sends back a "data" command invoked our
-#       the slave interpreter.  The purpose is to collect the min/max of the
-#       volume sent to the render server.  Since the client (nanovisviewer)
-#       doesn't parse 3D data formats, we rely on the server (nanovis) to
-#       tell us what the limits are.  Once we've received the limits to all
-#       the data we've sent (tracked by _recvdDatasets) we can then determine
-#       what the transfer functions are for these volumes.
-#
-#
-#       Note: There is a considerable tradeoff in having the server report
-#             back what the data limits are.  It means that much of the code
-#             having to do with transfer-functions has to wait for the data
-#             to come back, since the isomarkers are calculated based upon
-#             the data limits.  The client code is much messier because of
-#             this.  The alternative is to parse any of the 3D formats on the
-#             client side.
+#       the slave interpreter.  The purpose was to collect the min/max of the
+#       volume sent to the render server.  This is no longer needed since we
+#       already know the limits.
 #
 itcl::body Rappture::NanovisViewer::ReceiveData { args } {
@@ -845 +839 @@
 
     set tag $info(tag)
-    set parts [split $tag -]
-
-    #
-    # Volumes don't exist until we're told about them.
-    #
-    set dataobj [lindex $parts 0]
-    set _serverDatasets($tag) 1
-    if { $_settings(-volumevisible) && $dataobj == $_first } {
-        SendCmd "volume state 1 $tag"
-    }
-    set _limits($tag) [list $info(min)  $info(max)]
-    set _limits(v)    [list $info(vmin) $info(vmax)]
-
-    unset _recvdDatasets($tag)
-    if { [array size _recvdDatasets] == 0 } {
-        updateTransferFunctions
-    }
+    set _limits($tag) [list $info(min) $info(max)]
 }
 
@@ -892 +870 @@
     }
 
-    foreach dataobj [get] {
+    set _first ""
+    SendCmd "volume state 0"
+    foreach dataobj [get -objects] {
+        if { [info exists _obj2ovride($dataobj-raise)] &&  $_first == "" } {
+            set _first $dataobj
+        }
         foreach cname [$dataobj components] {
             set tag $dataobj-$cname
-            if { ![info exists _serverDatasets($tag)] } {
-                # Send the data as one huge base64-encoded mess -- yuck!
+            if { ![info exists _datasets($tag)] } {
                 if { [$dataobj type] == "dx" } {
-                    if { ![$dataobj isvalid] } {
-                        puts stderr "??? $dataobj is invalid"
-                    }
                     set data [$dataobj blob $cname]
                 } else {
@@ -926 +905 @@
                 SendCmd "volume data follows $nbytes $tag"
                 SendData $data
-                set _recvdDatasets($tag) 1
-                set _serverDatasets($tag) 0
+                set _datasets($tag) 1
             }
             SetObjectStyle $dataobj $cname
-        }
-    }
-    set _first [lindex [get] 0]
+            if { [info exists _obj2ovride($dataobj-raise)] } {
+                SendCmd "volume state 1 $tag"
+            }
+        }
+    }
     # Outline seems to need to be reset every update.
     InitSettings -outlinevisible -cutplanesvisible
     if { $_reset } {
+        # Turn off cutplanes for all volumes
+        foreach axis {x y z} {
+            SendCmd "cutplane state 0 $axis"
+        }
+
+        InitSettings -axesvisible -gridvisible \
+            -light2side -isosurfaceshading -opacity \
+            -light \
+            -xcutplanevisible -ycutplanevisible -zcutplanevisible \
+            -current
+
         #
         # Reset the camera and other view parameters
         #
+        if {"" != $_first} {
+            set axis [$_first hints updir]
+            if { "" != $axis } {
+                SendCmd "up $axis"
+            }
+            set location [$_first hints camera]
+            if { $location != "" } {
+                array set _view $location
+            }
+        }
         set _settings(-qw)    $_view(-qw)
         set _settings(-qx)    $_view(-qx)
@@ -953 +954 @@
         PanCamera
         SendCmd "camera zoom $_view(-zoom)"
-
-        # Turn off cutplanes for all volumes
-        foreach axis {x y z} {
-            SendCmd "cutplane state 0 $axis"
-        }
-
-        InitSettings -axesvisible -gridvisible \
-            -light2side -isosurfaceshading -opacity \
-            -light \
-            -xcutplanevisible -ycutplanevisible -zcutplanevisible \
-            -current
-
-        if {"" != $_first} {
-            set axis [$_first hints updir]
-            if { "" != $axis } {
-                SendCmd "up $axis"
-            }
-            set location [$_first hints camera]
-            if { $location != "" } {
-                array set _view $location
-            }
-        }
-    }
-
-    # nothing to send -- activate the proper ivol
-    SendCmd "volume state 0"
+    }
+
     if {"" != $_first} {
-        set datasets [array names _serverDatasets $_first-*]
-        if { $datasets != "" } {
-            SendCmd "volume state 1 $datasets"
-        }
-        # If the first volume already exists on the server, then make sure
-        # we display the proper transfer function in the legend.
-        set cname [lindex [$_first components] 0]
-        if { [info exists _serverDatasets($_first-$cname)] } {
-            updateTransferFunctions
-        }
+        # Make sure we display the proper transfer function in the legend.
+        updateTransferFunctions
     }
     # Actually write the commands to the server socket.  If it fails, we don't
@@ -1013 +982 @@
     foreach cname [$_first components] {
         set tag $_first-$cname
-        if { [info exists _serverDatasets($tag)] && $_serverDatasets($tag) } {
+        if { [info exists _datasets($tag)] && $_datasets($tag) } {
             array set style {
                 -cutplanes 1
@@ -1305 +1274 @@
         "-volume" {
             # This is the global volume visibility control.  It controls the
-            # visibility of all the all volumes.  Whenever it's changed, you
-            # have to synchronize each of the local controls (see below) with
-            # this.
+            # visibility of all the volumes.  Whenever it's changed, you have
+            # to synchronize each of the local controls (see below) with this.
             set datasets [CurrentDatasets]
             set bool $_settings($what)
@@ -2159 +2127 @@
     set list ""
     foreach tag $_volcomponents($cname) {
-        if { ![info exists _serverDatasets($tag)] } {
+        if { ![info exists _datasets($tag)] } {
             continue
         }