Changeset 2742 for branches/blt4/gui/scripts/nanovisviewer.tcl

Timestamp:

Dec 27, 2011 12:41:24 PM (12 years ago)

Author:

gah

Message:

sync with trunk

File:

• branches/blt4/gui/scripts/nanovisviewer.tcl (modified) (9 diffs)

branches/blt4/gui/scripts/nanovisviewer.tcl

@@ -156 +156 @@
     private variable _first ""     ;# This is the topmost volume.
     private variable _buffering 0
-    
+
     # This 
     # indicates which isomarkers and transfer
@@ -181 +181 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::NanovisViewer::constructor {hostlist args} {
+    set _serverType "nanovis"
 
     # Draw legend event
@@ -237 +238 @@
 
     itk_component add 3dview {
-        label $itk_component(plotarea).vol -image $_image(plot) \
+        label $itk_component(plotarea).view -image $_image(plot) \
             -highlightthickness 0 -borderwidth 0
     } {
@@ -749 +750 @@
         if { ![info exists _vol2style($vol)] } {
             puts stderr "unknown volume $vol"
-            continue;                   # How does this happen?
+            continue;                        # How does this happen?
         }
         set tf $_vol2style($vol)
@@ -843 +844 @@
         }
     }
+
+    # The colormap may have changed. Resync the slicers with the colormap.
+    set vols [CurrentVolumes -cutplanes]
+    SendCmd "volume data state $_settings($this-volume) $vols"
+
+    # 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]
+    foreach axis {x y z} {
+        # Turn off cutplanes for all volumes
+        SendCmd "cutplane state 0 $axis"
+        if { $_settings($this-${axis}cutplane) } {
+            # Turn on cutplane for this particular volume and set the position
+            SendCmd "cutplane state 1 $axis $vol"
+            set pos [expr {0.01*$_settings($this-${axis}cutposition)}]
+            SendCmd "cutplane position $pos $axis $vol"
+        }
+    }
 }
 
@@ -985 +1004 @@
         updatetransferfuncs
     }
-
-    # Sync the state of slicers
-    set vols [CurrentVolumes -cutplanes]
     foreach axis {x y z} {
-        SendCmd "cutplane state $_settings($this-${axis}cutplane) $axis $vols"
-        set pos [expr {0.01*$_settings($this-${axis}cutposition)}]
-        SendCmd "cutplane position $pos $axis $vols"
-    }
-    SendCmd "volume data state $_settings($this-volume) $vols"
-    set _buffering 0;                   # Turn off buffering.
+        # Turn off cutplanes for all volumes
+        SendCmd "cutplane state 0 $axis"
+    }
+    set _buffering 0;                        # Turn off buffering.
     # Actually write the commands to the server socket.  If it fails, we don't
     # care.  We're finished here.
     blt::busy hold $itk_component(hull)
-    SendBytes $_outbuf;                 
+    SendBytes $_outbuf;                        
     blt::busy release $itk_component(hull)
-    set _outbuf "";                     # Clear the buffer.             
+    set _outbuf "";                        # Clear the buffer.                
 }
 
@@ -1022 +1036 @@
             }
             array set style [lindex [$_first components -style $comp] 0]
-            if {$what != "-cutplanes" || $style(-cutplanes)} {
+            if { $what != "-cutplanes" || $style(-cutplanes) } {
                 lappend rlist $vol
             }
@@ -1300 +1314 @@
             if { [isconnected] } {
                 set vols [CurrentVolumes -cutplanes] 
-                SendCmd "cutplane state $bool $axis $vols"
+                set vol [lindex $vols 0]
+                SendCmd "cutplane state $bool $axis $vol"
             }
             if { $bool } {
@@ -1992 +2007 @@
             set newpos [expr {0.01*$newval}]
             set vols [CurrentVolumes -cutplanes]
-            SendCmd "cutplane position $newpos $axis $vols"
+            set vol [lindex $vols 0]
+            SendCmd "cutplane position $newpos $axis $vol"
         }
         default {