Changeset 3340

Timestamp:

Feb 25, 2013 10:41:03 AM (11 years ago)

Author:

ldelgass

Message:

Merge fix for nanovisviewer from trunk

Location:

branches/nanovis2

Files:

• . (modified) (1 prop)
• gui/scripts/nanovisviewer.tcl (modified) (28 diffs)

branches/nanovis2/gui/scripts/nanovisviewer.tcl

@@ -86 +86 @@
 
     protected method Connect {}
-    protected method CurrentVolumes {{what -all}}
+    protected method CurrentDatasets {{what -all}}
     protected method Disconnect {}
     protected method DoResize {}
@@ -127 +127 @@
     private variable _allDataObjs
     private variable _obj2ovride   ;# maps dataobj => style override
-    private variable _serverVols   ;# contains all the dataobj-component 
+    private variable _serverDatasets   ;# contains all the dataobj-component 
                                    ;# to volumes in the server
     private variable _serverTfs    ;# contains all the transfer functions 
                                    ;# in the server.
-    private variable _recvdVols    ;# list of data objs to send to server
-    private variable _vol2style    ;# maps dataobj-component to transfunc
-    private variable _style2vols   ;# maps tf back to list of 
+    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 
                                     # dataobj-components using the tf.
 
@@ -141 +141 @@
     private variable _view         ;# view params for 3D view
     private variable _isomarkers    ;# array of isosurface level values 0..1
-    private common   _settings
+    private variable  _settings
     # Array of transfer functions in server.  If 0 the transfer has been
     # defined but not loaded.  If 1 the transfer function has been named
@@ -506 +506 @@
             array unset _limits $dataobj*
             array unset _obj2ovride $dataobj-*
-            array unset _vol2style $dataobj-*
+            array unset _dataset2style $dataobj-*
             set changed 1
         }
@@ -643 +643 @@
     # disconnected -- no more data sitting on server
     set _outbuf ""
-    array unset _serverVols
+    array unset _serverDatasets
 }
 
@@ -687 +687 @@
     set thickness [expr {double($_settings($this-thickness)) * 0.0001}]
 
-    foreach vol [CurrentVolumes] {
-        if { ![info exists _serverVols($vol)] || !$_serverVols($vol) } {
+    foreach tag [CurrentDatasets] {
+        if { ![info exists _serverDatasets($tag)] || !$_serverDatasets($tag) } {
             # The volume hasn't reached the server yet.  How did we get 
             # here?
@@ -694 +694 @@
             continue
         }
-        if { ![info exists _vol2style($vol)] } {
-            puts stderr "Don't have style for volume $vol"
+        if { ![info exists _dataset2style($tag)] } {
+            puts stderr "Don't have style for volume $tag"
             continue;                        # How does this happen?
         }
-        set tf $_vol2style($vol)
+        set tf $_dataset2style($tag)
         set _settings($this-$tf-opacity) $opacity
         set _settings($this-$tf-thickness) $thickness
@@ -709 +709 @@
             set _activeTfs($tf) 1
         }
-        SendCmd "volume shading transfunc $tf $vol"
+        SendCmd "volume shading transfunc $tf $tag"
     }
     FixLegend
@@ -792 +792 @@
 
     # The colormap may have changed. Resync the slicers with the colormap.
-    set vols [CurrentVolumes -cutplanes]
-    SendCmd "volume data state $_settings($this-volume) $vols"
+    set datasets [CurrentDatasets -cutplanes]
+    SendCmd "volume data state $_settings($this-volume) $datasets"
 
     # Adjust the cutplane for only the first component in the topmost volume
     # (i.e. the first volume designated in the field).
-    set vol [lindex $vols 0]
+    set tag [lindex $datasets 0]
     foreach axis {x y z} {
         # Turn off cutplanes for all volumes
@@ -803 +803 @@
         if { $_settings($this-${axis}cutplane) } {
             # Turn on cutplane for this particular volume and set the position
-            SendCmd "cutplane state 1 $axis $vol"
+            SendCmd "cutplane state 1 $axis $tag"
             set pos [expr {0.01*$_settings($this-${axis}cutposition)}]
-            SendCmd "cutplane position $pos $axis $vol"
+            SendCmd "cutplane position $pos $axis $tag"
         }
     }
@@ -819 +819 @@
 #       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 _recvdVols) we can then determine
+#       the data we've sent (tracked by _recvdDatasets) we can then determine
 #       what the transfer functions are for these volumes.
 #
@@ -848 +848 @@
     #
     set dataobj [lindex $parts 0]
-    set _serverVols($tag) 1
+    set _serverDatasets($tag) 1
     if { $_settings($this-volume) && $dataobj == $_first } {
         SendCmd "volume state 1 $tag"
@@ -857 +857 @@
     set _limits(vmax)      $info(vmax); # Overall maximum value.
 
-    unset _recvdVols($tag)
-    if { [array size _recvdVols] == 0 } {
+    unset _recvdDatasets($tag)
+    if { [array size _recvdDatasets] == 0 } {
         # The active transfer function is by default the first component of
         # the first data object.  This assumes that the data is always
@@ -895 +895 @@
 
     foreach dataobj [get] {
-        foreach comp [$dataobj components] {
-            set vol $dataobj-$comp
-            if { ![info exists _serverVols($vol)] } {
+        foreach cname [$dataobj components] {
+            set tag $dataobj-$cname
+            if { ![info exists _serverDatasets($tag)] } {
                 # Send the data as one huge base64-encoded mess -- yuck!
-                set data [$dataobj values $comp]
+                set data [$dataobj values $cname]
                 set nbytes [string length $data]
-                append _outbuf "volume data follows $nbytes $vol\n"
+                append _outbuf "volume data follows $nbytes $tag\n"
                 append _outbuf $data
-                set _recvdVols($vol) 1
-                set _serverVols($vol) 0
-            }
-            NameTransferFunc $dataobj $comp
-        }
-    }
+                set _recvdDatasets($tag) 1
+                set _serverDatasets($tag) 0
+            }
+            NameTransferFunc $dataobj $cname
+        }
+    }
+    set _first [lindex [get] 0]
     if { $_reset } {
         #
@@ -943 +944 @@
         FixSettings outline
         
-        # nothing to send -- activate the proper ivol
-        SendCmd "volume state 0"
-        set _first [lindex [get] 0]
+        foreach axis {x y z} {
+            # Turn off cutplanes for all volumes
+            SendCmd "cutplane state 0 $axis"
+        }
         if {"" != $_first} {
             set axis [$_first hints updir]
@@ -955 +957 @@
                 array set _view $location
             }
-            set vols [array names _serverVols $_first-*] 
-            if { $vols != "" } {
-                SendCmd "volume state 1 $vols"
-            }
             if 1 {
-                # Tell the server the name of the tool, the version, and dataset
-                # that we are rendering.  Have to do it here because we don't know
-                # what data objects are using the renderer until be get here.
+                # Tell the server the name of the tool, the version, and
+                # dataset that we are rendering.  Have to do it here because
+                # we don't know what data objects are using the renderer until
+                # be get here.
                 global env
 
@@ -980 +979 @@
                 SendCmd "clientinfo [list $out]"
             }
-
-            foreach axis {x y z} {
-                # Turn off cutplanes for all volumes
-                SendCmd "cutplane state 0 $axis"
-            }
-            
-            # If the first volume already exists on the server, then make sure
-            # we display the proper transfer function in the legend.
-            set comp [lindex [$_first components] 0]
-            if { [info exists _serverVols($_first-$comp)] } {
-                updatetransferfuncs
-            }
         }
+    }
+    # 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)] } {
+            updatetransferfuncs
+        }
     }
     set _buffering 0;                        # Turn off buffering.
@@ -1005 +1006 @@
 
 # ----------------------------------------------------------------------
-# USAGE: CurrentVolumes ?-cutplanes?
+# USAGE: CurrentDatasets ?-cutplanes?
 #
 # Returns a list of volume server IDs for the current volume being
@@ -1011 +1012 @@
 # of IDs if the current data object has multiple components.
 # ----------------------------------------------------------------------
-itcl::body Rappture::NanovisViewer::CurrentVolumes {{what -all}} {
+itcl::body Rappture::NanovisViewer::CurrentDatasets {{what -all}} {
     set rlist ""
     if { $_first == "" } {
         return
     }
-    foreach comp [$_first components] {
-        set vol $_first-$comp
-        if { [info exists _serverVols($vol)] && $_serverVols($vol) } {
+    foreach cname [$_first components] {
+        set tag $_first-$cname
+        if { [info exists _serverDatasets($tag)] && $_serverDatasets($tag) } {
             array set style {
                 -cutplanes 1
             }
-            array set style [lindex [$_first components -style $comp] 0]
+            array set style [lindex [$_first components -style $cname] 0]
             if { $what != "-cutplanes" || $style(-cutplanes) } {
-                lappend rlist $vol
+                lappend rlist $tag
             }
         }
@@ -1327 +1328 @@
         "volume" {
             if { [isconnected] } {
-                set vols [CurrentVolumes -cutplanes] 
-                SendCmd "volume data state $_settings($this-volume) $vols"
+                set datasets [CurrentDatasets -cutplanes] 
+                SendCmd "volume data state $_settings($this-volume) $datasets"
             }
         }
@@ -1335 +1336 @@
             set bool $_settings($this-$what)
             if { [isconnected] } {
-                set vols [CurrentVolumes -cutplanes] 
-                set vol [lindex $vols 0]
-                SendCmd "cutplane state $bool $axis $vol"
+                set datasets [CurrentDatasets -cutplanes] 
+                set tag [lindex $datasets 0]
+                SendCmd "cutplane state $bool $axis $tag"
             }
             if { $bool } {
@@ -1366 +1367 @@
     set h [expr {[winfo height $itk_component(legend)]-20-$lineht}]
     if {$w > 0 && $h > 0 && [array names _activeTfs] > 0 && $_first != "" } {
-        set vol [lindex [CurrentVolumes] 0]
-        if { [info exists _vol2style($vol)] } {
-            SendCmd "legend $_vol2style($vol) $w $h"
+        set tag [lindex [CurrentDatasets] 0]
+        if { [info exists _dataset2style($tag)] } {
+            SendCmd "legend $_dataset2style($tag) $w $h"
         }
     } else {
@@ -1393 +1394 @@
 #              now.
 #
-itcl::body Rappture::NanovisViewer::NameTransferFunc { dataobj comp } {
+itcl::body Rappture::NanovisViewer::NameTransferFunc { dataobj cname } {
     array set style {
         -color rainbow
@@ -1400 +1401 @@
         -markers ""
     }
-    array set style [lindex [$dataobj components -style $comp] 0]
+    set tag $dataobj-$cname
+    array set style [lindex [$dataobj components -style $cname] 0]
     set tf "$style(-color):$style(-levels):$style(-opacity)"
-    set _vol2style($dataobj-$comp) $tf
-    lappend _style2vols($tf) $dataobj-$comp
+    set _dataset2style($tag) $tf
+    lappend _style2datasets($tf) $tag
     return $tf
 }
@@ -1423 +1425 @@
         -markers ""
     }
-    foreach {dataobj comp} [split [lindex $_style2vols($tf) 0] -] break
-    array set style [lindex [$dataobj components -style $comp] 0]
+    foreach {dataobj cname} [split [lindex $_style2datasets($tf) 0] -] break
+    array set style [lindex [$dataobj components -style $cname] 0]
 
     puts stderr "$tf: $style(-color), $style(-levels), $style(-opacity), $style(-markers)"
@@ -1632 +1634 @@
         error "active transfer function isn't set"
     }
-    set vol [lindex [CurrentVolumes] 0]
-    set tf $_vol2style($vol)
+    set tag [lindex [CurrentDatasets] 0]
+    set tf $_dataset2style($tag)
     set c $itk_component(legend)
     set m [Rappture::IsoMarker \#auto $c $this $tf]
@@ -1686 +1688 @@
     set _limits(min) 0.0
     set _limits(max) 1.0
-    if { ![info exists _style2vols($tf)] } {
+    if { ![info exists _style2datasets($tf)] } {
         return [array get _limits]
     }
     set min ""; set max ""
-    foreach vol $_style2vols($tf) {
-        if { ![info exists _serverVols($vol)] } {
+    foreach tag $_style2datasets($tf) {
+        if { ![info exists _serverDatasets($tag)] } {
             continue
         }
-        if { ![info exists _limits($vol-min)] } {
+        if { ![info exists _limits($tag-min)] } {
             continue
         }
-        if { $min == "" || $min > $_limits($vol-min) } {
-            set min $_limits($vol-min)
-        }
-        if { $max == "" || $max < $_limits($vol-max) } {
-            set max $_limits($vol-max)
+        if { $min == "" || $min > $_limits($tag-min) } {
+            set min $_limits($tag-min)
+        }
+        if { $max == "" || $max < $_limits($tag-max) } {
+            set max $_limits($tag-max)
         }
     }
@@ -2029 +2031 @@
 
             set newpos [expr {0.01*$newval}]
-            set vols [CurrentVolumes -cutplanes]
-            set vol [lindex $vols 0]
-            SendCmd "cutplane position $newpos $axis $vol"
+            set datasets [CurrentDatasets -cutplanes]
+            set tag [lindex $datasets 0]
+            SendCmd "cutplane position $newpos $axis $tag"
         }
         default {