Changeset 3804

Timestamp:

Jul 15, 2013 11:25:45 AM (11 years ago)

Author:

gah

Message:

fix limits on axis

Location:

branches/1.3/gui/scripts

Files:

• molvisviewer.tcl (modified) (1 diff)
• resultviewer.tcl (modified) (2 diffs)
• xyresult.tcl (modified) (6 diffs)

branches/1.3/gui/scripts/molvisviewer.tcl

@@ -450 +450 @@
         -param          ""
     }
-    array set params $settings
+    array set params $options
 
     set pos [lsearch -exact $dataobj $_dlist]

branches/1.3/gui/scripts/resultviewer.tcl

@@ -118 +118 @@
                 set slot [lindex $_dataslots $i]
                 foreach dobj $slot {
+                    if {"" != $_mode} {
+                        $_mode2widget($_mode) delete $dobj
+                    }
                     itcl::delete object $dobj
                 }
@@ -138 +141 @@
                 }
 
+                if {"" != $_mode} {
+                    $_mode2widget($_mode) delete $dobj
+                }
                 # destroy the object and forget it
                 itcl::delete object $dobj

branches/1.3/gui/scripts/xyresult.tcl

@@ -1131 +1131 @@
             } else {
                 # Set the axis range from the entry values.
-                set min $_axisPopup($axis-min)
-                set max $_axisPopup($axis-max)
+                set label $_axisPopup(label)
+                set min $_axisPopup(${label}-min)
+                set max $_axisPopup(${label}-max)
                 $g axis configure $axis -min $min -max $max
             }
@@ -1158 +1159 @@
                 return
             }
-            set _axisPopup($axis-min) $min
+            set label $_axisPopup(label)
+            set _axisPopup(${label}-min) $min
         }
         "max" {
@@ -1168 +1170 @@
                 return
             }
-            set _axisPopup($axis-max) $max
+            set label $_axisPopup(label)
+            set _axisPopup(${label}-max) $max
         }
     }
@@ -1339 +1342 @@
     }
     set amin ""
-    if { [info exists _limits(${axis}${type}-min)] } {
-        set amin $_limits(${axis}${type}-min)
+    set label $_axisPopup(label)
+    if { [info exists _limits(${label}-min)] } {
+        set amin $_limits(${label}-min)
     }
     set amax ""
-    if { [info exists _limits(${axis}${type}-max)] } {
-        set amax $_limits(${axis}${type}-max)
+    if { [info exists _limits(${label}-max)] } {
+        set amax $_limits(${label}-max)
     }
     set auto 1 
@@ -1355 +1359 @@
     set _axisPopup(auto)  $_axisPopup($axis-auto)
     SetAxisRangeState $axis
-    if { ![info exists _axisPopup($axis-min)] } {
+    if { ![info exists _axisPopup(${label}-min)] } {
         if { $amin != "" } {
-            set _axisPopup($axis-min) $amin
-            set _axisPopup(min)   $_axisPopup($axis-min)
+            set _axisPopup(${label}-min) $amin
+            set _axisPopup(min)   $_axisPopup(${label}-min)
             SetAxis min
         } else {
-            set _axisPopup($axis-min) $min
-        }
-    }
-    if { ![info exists _axisPopup($axis-max)] } {
+            set _axisPopup(${label}-min) $min
+        }
+    }
+    if { ![info exists _axisPopup(${label}-max)] } {
         if { $amax != "" } {
-            set _axisPopup($axis-max) $amax
-            set _axisPopup(max)   $_axisPopup($axis-max)
+            set _axisPopup(${label}-max) $amax
+            set _axisPopup(max)   $_axisPopup(${label}-max)
             SetAxis max
         } else {
-            set _axisPopup($axis-max) $max
-        }
-    }
-    set _axisPopup(min)   $_axisPopup($axis-min)
-    set _axisPopup(max)   $_axisPopup($axis-max)
+            set _axisPopup(${label}-max) $max
+        }
+    }
+    set _axisPopup(min)  $_axisPopup(${label}-min)
+    set _axisPopup(max)  $_axisPopup(${label}-max)
     set _axisPopup(axis) $axis
 
@@ -1480 +1484 @@
             if { $min != "" && ( ![info exists _limits($tag)] || 
                                    $_limits($tag) > $min ) } {
-                set _limits(tag) $min
+                set _limits($tag) $min
             }
             set tag ${label}-max