Changeset 578 for trunk

Timestamp:

Feb 19, 2007, 11:07:33 AM (18 years ago)

Author:

dkearney

Message:

added code to normalize the units entered by the user

File:

• trunk/gui/scripts/gauge.tcl (modified) (4 diffs)

trunk/gui/scripts/gauge.tcl

@@ -219 +219 @@
         set units $itk_option(-units)
         if {"" != $units} {
-            set newval [Rappture::Units::convert $newval \
-                -context $units]
+            set newval [Rappture::Units::convert $newval -context $units]
             set nvUnits [Rappture::Units::Search::for $newval]
             if { "" == $nvUnits} {
                 set msg [Rappture::Units::description $units]
-                error "Unrecognized units: $newval\nEnter value with units $msg"
+                error "Unrecognized units: $newval\nEnter value with units of $msg"
             }
             set nv [Rappture::Units::convert $nv \
                 -context $units -to $units -units off]
+
+            # Normalize the units name
+            set newval [Rappture::Units::convert $newval -units off]$nvUnits
         }
 
@@ -245 +247 @@
         if {"" != $itk_option(-minvalue)} {
             set convMinVal [set minv $itk_option(-minvalue)]
-            if {$units != ""} {
+            if {"" != $units} {
                 set minv [Rappture::Units::convert $minv \
                     -context $units -to $units -units off]
@@ -266 +268 @@
         if {"" != $itk_option(-maxvalue)} {
             set convMaxVal [set maxv $itk_option(-maxvalue)]
-            if {$units != ""} {
+            if {"" != $units} {
                 set maxv [Rappture::Units::convert $maxv \
                     -context $units -to $units -units off]
@@ -288 +290 @@
             return
         }
+
         set _value $newval
+
         _redraw
         event generate $itk_component(hull) <<Value>>