Changeset 552 for trunk

Timestamp:

Dec 7, 2006, 3:15:58 PM (18 years ago)

Author:

dkearney

Message:

adjusted the formatting to use %g which chops off random zeros at the end of values so integers still look like integers and floats can live happily in "less than 6 digit percision"-land. also added in code to format newval which is the real value being stored in the component. formatting of newval only happens if the newval does not have units attached to it. this fix introduces a place of confusion where the user enters "." into an integer input, the error message states the user needs to enter a floating point number. then the user enters a floating point number and the error message states the user needs to enter an integer. might consider moving the integer check up, in front of the min/max value check

File:

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

trunk/gui/scripts/gauge.tcl

@@ -234 +234 @@
                     $itk_option(-minvalue) -to $nvUnits]
             } else {
-                # fix for the case when the user tries to
-                # compare values like minv=-500 nv=-0600
-                set nv [format "%f" $nv]
-                set minv [format "%f" $minv]
-            }
+                set newval [format "%g" $newval]
+            }
+            
+            # fix for the case when the user tries to
+            # compare values like minv=-500 nv=-0600
+            set nv [format "%g" $nv]
+            set minv [format "%g" $minv]
+
             if {$nv < $minv} {
                 error "minimum value allowed here is $convMinVal"
@@ -252 +255 @@
                     $itk_option(-maxvalue) -to $nvUnits]
             } else {
-                # fix for the case when the user tries to
-                # compare values like maxv=500 nv=0600
-                set nv [format "%f" $nv]
-                set minv [format "%f" $minv]
-            }
+                set newval [format "%g" $newval]
+            }
+
+            # fix for the case when the user tries to
+            # compare values like maxv=500 nv=0600
+            set nv [format "%g" $nv]
+            set maxv [format "%g" $maxv]
+
             if {$nv > $maxv} {
                 error "maximum value allowed here is $convMaxVal"