Changeset 738 for trunk/gui/scripts/energyLevels.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/energyLevels.tcl (modified) (3 diffs)

trunk/gui/scripts/energyLevels.tcl

@@ -362 +362 @@
         }
     }
+
+    if {"" != $_emin && $_emin == $_emax} {
+        set _emin [expr {$_emin-0.1}]
+        set _emax [expr {$_emax+0.1}]
+    }
+
     set _eviewmin ""  ;# reset zoom view
     set _eviewmax ""
@@ -471 +477 @@
                 set _ehomo [lindex $elist $nhomo]
                 set _elumo [lindex $elist $nlumo]
-                set gap [expr {$_elumo - $_ehomo}]
-                set _edefmin [expr {$_ehomo - 0.3*$gap}]
-                set _edefmax [expr {$_elumo + 0.3*$gap}]
-
-                set y [expr {($_ehomo-$_emin)*$e2y + $yzoom0}]
-                set id [$c create rectangle $xx0 $y $xx1 $y0 \
-                    -stipple [Rappture::icon rdiag] \
-                    -outline "" -fill $itk_option(-shadecolor)]
-                $c lower $id
+                if {"" != $_elumo && "" != $_ehomo} {
+                    set gap [expr {$_elumo - $_ehomo}]
+                    set _edefmin [expr {$_ehomo - 0.3*$gap}]
+                    set _edefmax [expr {$_elumo + 0.3*$gap}]
+
+                    set y [expr {($_ehomo-$_emin)*$e2y + $yzoom0}]
+                    set id [$c create rectangle $xx0 $y $xx1 $y0 \
+                        -stipple [Rappture::icon rdiag] \
+                        -outline "" -fill $itk_option(-shadecolor)]
+                    $c lower $id
+                }
             }
         }
@@ -543 +551 @@
         }
 
-        if {"" != $_ehomo && "" != $_elumo} {
+        if {"" != $topdobj && "" != $_ehomo && "" != $_elumo} {
             set ecol $_dobj2cols($topdobj-energy)
             set units [$topdobj columns -units $ecol]