Changeset 550 for trunk

Timestamp:

Dec 7, 2006, 3:46:45 AM (18 years ago)

Author:

dkearney

Message:

fix for rappture ticket 157 where error messages about units min and max values are converted to the same units the user specified, not the units the developer specified.

File:

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

trunk/gui/scripts/gauge.tcl

@@ -213 +213 @@
         # the value is bound by any min/max value constraints.
         #
+        # Keep track of the inputted units so we can give a 
+        # response about min and max values in familiar units.
+        #
         set newval [set nv [lindex $args 0]]
         set units $itk_option(-units)
         if {$units != ""} {
+            set nvUnits [Rappture::Units::Search::for $nv]
             set newval [Rappture::Units::convert $newval \
                 -context $units]
@@ -223 +227 @@
 
         if {"" != $itk_option(-minvalue)} {
-            set minv $itk_option(-minvalue)
+            set convMinVal [set minv $itk_option(-minvalue)]
             if {$units != ""} {
                 set minv [Rappture::Units::convert $minv \
                     -context $units -to $units -units off]
+                set convMinVal [Rappture::Units::convert \
+                    $itk_option(-minvalue) -to $nvUnits]
             }
             if {$nv < $minv} {
-                error "minimum value allowed here is $itk_option(-minvalue)"
+                error "minimum value allowed here is $convMinVal"
             }
         }
 
         if {"" != $itk_option(-maxvalue)} {
-            set maxv $itk_option(-maxvalue)
+            set convMaxVal [set maxv $itk_option(-maxvalue)]
             if {$units != ""} {
                 set maxv [Rappture::Units::convert $maxv \
                     -context $units -to $units -units off]
+                set convMaxVal [Rappture::Units::convert \
+                    $itk_option(-maxvalue) -to $nvUnits]
             }
             if {$nv > $maxv} {
-                error "maximum value allowed here is $itk_option(-maxvalue)"
+                error "maximum value allowed here is $convMaxVal"
             }
         }