Changeset 4084 for trunk

Timestamp:

Dec 17, 2013, 3:53:19 PM (11 years ago)

Author:

gah

Message:

add test of volumes in the working set make visible

File:

• trunk/gui/scripts/vtkvolumeviewer.tcl (modified) (4 diffs)

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ -168 +168 @@
     private variable _curFldLabel ""
     private variable _cutplaneCmd "imgcutplane"
+    private variable _activeVolumes;   # Array of volumes that are active.
 }
 
@@ -1024 +1025 @@
 
     SendCmd "dataset visible 0"
+
+    # No volumes are active (i.e. in the working set of displayed volumes).
+    # A volume is always invisible if it's not in the working set.  A 
+    # volume in the working set may be visible/invisible depending upon the
+    # global visibility value.
+    array unset _activeVolumes
     foreach dataobj [get -objects] {
         if { [info exists _obj2ovride($dataobj-raise)] &&  $_first == "" } {
@@ -1110 +1117 @@
         cutplaneVisible \
         cutplanePositionX cutplanePositionY cutplanePositionZ \
-        cutplaneVisibleX cutplaneVisibleY cutplaneVisibleZ
+        cutplaneVisibleX cutplaneVisibleY cutplaneVisibleZ 
 
     if { $_reset } {
@@ -1366 +1373 @@
             set bool $_settings(volumeVisible)
             set _settings($_current-volumeVisible) $bool
+            # Only the data objects in the array _obj2ovride(*-raise) are
+            # in the working set and can be displayed on screen. The global
+            # volume control determines whether they are visible.
+            #
+            # Note: The use of the current component is a hold over from 
+            #       nanovis.  If we can't display more than one volume,
+            #       we don't have to limit the effects to a specific 
+            #       component.
             foreach tag [GetDatasetsWithComponent $_current] {
-                SendCmd "volume visible $bool $tag"
+                foreach {dataobj cname} [split $tag -] break
+                if { [info exists _obj2ovride($dataobj-raise)] } {
+                    SendCmd "volume visible $bool $tag"
+                }
             }
             if { $bool } {