Changeset 1247 for trunk/gui/scripts/nanovisviewer.tcl

Timestamp:

Dec 1, 2008 11:31:44 AM (15 years ago)

Author:

gah

Message:

Fix for interrupted nanovis session

File:

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

trunk/gui/scripts/nanovisviewer.tcl

@@ -57 +57 @@
     public method delete {args}
     public method scale {args}
-    public method GetLimits { ivol } 
+    public method GetLimits { tf } 
     public method download {option args}
     public method parameters {title args} { 
@@ -885 +885 @@
     if { ![info exists $_obj2styles($first)] } {
         foreach tf $_obj2styles($first) {
-            if { ![_ComputeTransferFunction $tf] } {
-                return
-            }
+            _ComputeTransferFunction $tf
         }
         _fixLegend
@@ -949 +947 @@
             [itcl::code $this _AddIsoMarker %x %y]
     }
-    array set limits [GetLimits $ivol]
+    # Display the markers used by the active volume.
+    set tf $_id2style($activeId_)
+
+    array set limits [GetLimits $tf]
     $c itemconfigure vmin -text [format %.2g $limits(min)]
     $c coords vmin $lx $ly
@@ -956 +957 @@
     $c coords vmax [expr {$w-$lx}] $ly
 
-    # Display the markers used by the active volume.
-    set tf $_id2style($activeId_)
     if { [info exists isomarkers_($tf)] } {
         foreach m $isomarkers_($tf) {
@@ -1547 +1546 @@
         -opacity 1.0
     }
-    set ivol [lindex $_style2ids($tf) 0]
-    foreach {dataobj comp} $_id2obj($ivol) break
+    set dataobj ""; set comp ""
+    foreach ivol $_style2ids($tf) {
+        if { [info exists _id2obj($ivol)] } {
+            foreach {dataobj comp} $_id2obj($ivol) break
+            break
+        }
+    }
+    if { $dataobj == "" } {
+        return 0
+    }
     array set style [lindex [$dataobj components -style $comp] 0]
 
@@ -1698 +1705 @@
         for {set i 1} { $i <= $levels } {incr i} {
             set x [expr {double($i)/($levels+1)}]
-            set m [IsoMarker \#auto $c $this $ivol]
+            set m [IsoMarker \#auto $c $this $tf]
             $m SetRelativeValue $x
             lappend isomarkers_($tf) $m 
@@ -1704 +1711 @@
     } else {
         foreach x $levels {
-            set m [IsoMarker \#auto $c $this $ivol]
+            set m [IsoMarker \#auto $c $this $tf]
             $m SetRelativeValue $x
             lappend isomarkers_($tf) $m 
@@ -1731 +1738 @@
             # ${n}% : Set relative value. 
             set value [expr {$value * 0.01}]
-            set m [IsoMarker \#auto $c $this $ivol]
+            set m [IsoMarker \#auto $c $this $tf]
             $m SetRelativeValue $value
             lappend isomarkers_($tf) $m
         } else {
             # ${n} : Set absolute value.
-            set m [IsoMarker \#auto $c $this $ivol]
+            set m [IsoMarker \#auto $c $this $tf]
             $m SetAbsoluteValue $value
             lappend isomarkers_($tf) $m
@@ -1763 +1770 @@
     set tf $_id2style($activeId_)
     set c $itk_component(legend)
-    set m [IsoMarker \#auto $c $this $activeId_]
+    set m [IsoMarker \#auto $c $this $tf]
     set w [winfo width $c]
     $m SetRelativeValue [expr {double($x-10)/($w-20)}]
@@ -1772 +1779 @@
 
 itcl::body Rappture::NanovisViewer::RemoveDuplicateIsoMarker { marker x } {
-    set ivol [$marker GetVolume]
-    set tf $_id2style($ivol)
+    set tf [$marker GetTransferFunction]
     set bool 0
     if { [info exists isomarkers_($tf)] } {
@@ -1798 +1804 @@
 
 itcl::body Rappture::NanovisViewer::OverIsoMarker { marker x } {
-    set ivol [$marker GetVolume]
-    if { [info exists isomarkers_($ivol)] } {
+    set tf [$marker GetTransferFunction]
+    if { [info exists isomarkers_($tf)] } {
         set marker [namespace tail $marker]
-        foreach m $isomarkers_($ivol) {
+        foreach m $isomarkers_($tf) {
             set sx [$m GetScreenPosition]
             if { $m != $marker } {
@@ -1812 +1818 @@
 }
 
-itcl::body Rappture::NanovisViewer::GetLimits { ivol } {
-    if { ![info exists _id2style($ivol)] } {
-        return
-    }
-    set tf $_id2style($ivol)
+itcl::body Rappture::NanovisViewer::GetLimits { tf } {
     set limits_(min) ""
     set limits_(max) ""