Changeset 3510

Timestamp:

Mar 16, 2013 8:33:10 AM (11 years ago)

Author:

gah

Message:

start of string trim fixes for gauge and switch (boolean)

Location:

trunk/gui/scripts

Files:

• gauge.tcl (modified) (1 diff)
• switch.tcl (modified) (1 diff)

trunk/gui/scripts/gauge.tcl

@@ -226 +226 @@
             if { "" == $nvUnits} {
                 set msg [Rappture::Units::description $units]
-                error "Unrecognized units: $newval\nEnter value with units of $msg"
+                error "unrecognized units in value \"$newval\": should be value with units of $msg"
             }
             set nv [Rappture::Units::convert $nv \

trunk/gui/scripts/switch.tcl

@@ -70 +70 @@
     if {[llength $args] == 1} {
         set newval [lindex $args 0]
-        if {![string is boolean -strict $newval]} {
-            error "Should be a boolean value"
+        # I don't like the "string is" commands. They have too many quirks.
+        # If we're calling "expr" anyways, just put a catch on it.
+        if { [catch {expr {($newval) ? 1 : 0}} newval] != 0 } {
+            error "$newval: should be a yes, no, on, off, true, false, 0, or 1."
         }
-        set newval [expr {($newval) ? 1 : 0}]
         if {$onlycheck} {
             return