Changeset 738 for trunk/gui/scripts/xyresult.tcl

Timestamp:

May 16, 2007, 7:37:45 PM (17 years ago)

Author:

mmc

Message:

Fixed a problem recently introduced with device structures on the
input side. app-rtd was having trouble changing the structure when
you changed devices via the loader.

Fix for support ticket #1631 'can't read "_axis(click-x)": no such
variable'. Added some code to guard against the case when release
gets called somehow before click.

Fix for support ticket #1688 'can't use empty string as operand of "-"'
Fix for support ticket #1689 'divide by zero'
Fix for support ticket #1707 'can't read "_dobj2cols(-energy)":
no such element in array'
All of these fixes had to do with the energy viewer, particularly
in the case where there was only 1 energy level, so the homo/lumo
levels could not be displayed.

Fix for support ticket #1704 'impossible limits (min 1.58489 >=
max 6.30957e-05)'
Added some code to guard against setting limits where min >= max.

File:

• trunk/gui/scripts/xyresult.tcl (modified) (3 diffs)

trunk/gui/scripts/xyresult.tcl

@@ -721 +721 @@
                 }
             }
-            if {$min != $max} {
+            if {$min < $max} {
                 $g axis configure $axis -min $min -max $max
             } else {
@@ -1010 +1010 @@
             if {[llength $args] != 3} {
                 error "wrong # args: should be \"_axis drag axis x y\""
+            }
+            if {![info exists _axis(moved)]} {
+                return  ;# must have skipped click event -- ignore
             }
             set axis [lindex $args 0]
@@ -1066 +1069 @@
                 error "wrong # args: should be \"_axis release axis x y\""
             }
+            if {![info exists _axis(moved)]} {
+                return  ;# must have skipped click event -- ignore
+            }
             set axis [lindex $args 0]
             set x [lindex $args 1]
             set y [lindex $args 2]
 
-            if {![info exists _axis(moved)] || !$_axis(moved)} {
+            if {!$_axis(moved)} {
                 # small movement? then treat as click -- pop up axis editor
                 set dx [expr {abs($x-$_axis(click-x))}]