Changeset 1248 for trunk/gui

Timestamp:

Dec 1, 2008 12:17:26 PM (15 years ago)

Author:

gah

Message:

Fix for interrupted nanovis session

File:

• trunk/gui/scripts/nanovisviewer.tcl (modified) (10 diffs)

trunk/gui/scripts/nanovisviewer.tcl

@@ -119 +119 @@
     private variable isomarkers_    ;# array of isosurface level values 0..1
     private common   settings_
-    private variable activeId_ ""   ;# The currently active volume.  This 
+    private variable activeTf_ ""  ;# The currently active transfer function.  
+                                    # This 
                                     # indicates which isomarkers and transfer
                                     # function to use when changing markers,
@@ -827 +828 @@
             _send "up $axis"
         }
-        # The active volume is by default the first component of the first
-        # data object.  This assumes that the data is always successfully
-        # transferred.
+        # 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 activeId_ $_obj2id($first-$comp)
+        set activeTf_ $_id2style($_obj2id($first-$comp))
     }
     foreach key [array names _obj2id *-*] {
@@ -868 +869 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::NanovisViewer::_SendTransferFunctions {} {
+    if { $activeTf_ == "" } {
+        return
+    }
+    set tf $activeTf_
     set first [lindex [get] 0] 
 
     # Insure that the global opacity and thickness settings (in the slider
-    # settings widgets) are used for the transfer-function used by the active
-    # volume.  Update the values in the settings_ varible.
+    # settings widgets) are used for the active transfer-function.  Update the
+    # values in the settings_ varible.
     set inner [$itk_component(controls).panel component inner]
-    set tf $_id2style($activeId_)
     set value [$inner.scales.opacity get]
     set opacity [expr { double($value) * 0.01 }]
@@ -916 +920 @@
 #       the slave interpreter.  The purpose is to collect data of the image 
 #       representing the legend in the canvas.  In addition, the isomarkers
-#       of the active volume are displayed.
+#       of the active transfer function are displayed.
 #
 #       I don't know is this is the right place to display the isomarkers.
@@ -947 +951 @@
             [itcl::code $this _AddIsoMarker %x %y]
     }
-    # Display the markers used by the active volume.
-    set tf $_id2style($activeId_)
+    # Display the markers used by the active transfer function.
+    set tf $activeTf_
 
     array set limits [GetLimits $tf]
@@ -1101 +1105 @@
         set ivol $_obj2id($first-$comp) 
         
-        set tf _id2style($ivol)
-    
         foreach comp [$first components] {
             foreach ivol $_obj2id($first-$comp) {
@@ -1434 +1436 @@
         }
         opacity {
-            if {[isconnected] && $activeId_ != "" } {
+            if {[isconnected] && $activeTf_ != "" } {
                 set val [$inner.scales.opacity get]
                 set sval [expr { 0.01 * double($val) }]
-                set tf $_id2style($activeId_)
+                set tf $activeTf_
                 set settings_($this-$tf-opacity) $sval
                 UpdateTransferFunctions
@@ -1444 +1446 @@
 
         thickness {
-            if {[isconnected] && $activeId_ != "" } {
+            if {[isconnected] && $activeTf_ != "" } {
                 set val [$inner.scales.thickness get]
                 # Scale values between 0.00001 and 0.01000
                 set sval [expr {0.0001*double($val)}]
-                set tf $_id2style($activeId_)
+                set tf $activeTf_
                 set settings_($this-$tf-thickness) $sval
                 UpdateTransferFunctions
@@ -1490 +1492 @@
     set w [expr {[winfo width $itk_component(legend)]-20}]
     set h [expr {[winfo height $itk_component(legend)]-20-$lineht}]
-    set ivol $activeId_
-    if {$w > 0 && $h > 0 && "" != $ivol} {
-        _send "legend $ivol $w $h"
+    if {$w > 0 && $h > 0 && "" != $activeTf_} {
+        _send "legend $activeTf_ $w $h"
     } else {
         # Can't do this as this will remove the items associated with the
@@ -1765 +1766 @@
 
 itcl::body Rappture::NanovisViewer::_AddIsoMarker { x y } {
-    if { $activeId_ == "" } {
-        error "active volume isn't set"
-    }
-    set tf $_id2style($activeId_)
+    if { $activeTf_ == "" } {
+        error "active transfer function isn't set"
+    }
+    set tf $activeTf_ 
     set c $itk_component(legend)
     set m [IsoMarker \#auto $c $this $tf]