Changeset 1400 for trunk/gui/scripts/radiodial.tcl

Timestamp:

Apr 15, 2009, 6:22:24 PM (16 years ago)

Author:

mmc

Message:

Fixed support ticket #5831, which produced an error message like:

can't set _cntlInfo(...): bad value "1e+18/cm3"

The problem arose when you simulated two values like 1e+18 and 1.0e+18.
The Radiodial understood that these were the same value, but it honored
only one of the string representations and rejected the other when you
tried to adjust the dials. It now keeps all recognized string values,
and maps the string onto the real value when you're manipulating the
control. Also fixed the ResultSet? to avoid creating the Radiodial when
the value is numerically the same even though strings are different.

File:

• trunk/gui/scripts/radiodial.tcl (modified) (11 diffs)

trunk/gui/scripts/radiodial.tcl

@@ -68 +68 @@
     protected method _navigate {offset}
     protected method _limits {}
+    protected method _findLabel {str}
     protected method _fixSize {}
     protected method _fixValue {args}
 
     private variable _values ""       ;# list of all values on the dial
-    private variable _val2label       ;# maps value => label
+    private variable _val2label       ;# maps value => string label(s)
     private variable _current ""      ;# current value (where pointer is)
     private variable _variable ""     ;# variable associated with -variable
@@ -128 +129 @@
         set value [llength $_values]
     }
-    lappend _values $value
-    set _values [lsort -real $_values]
-    set _val2label($value) $label
+
+    # Add this value if we've never see it before
+    if {[lsearch -real $_values $value] < 0} {
+        lappend _values $value
+        set _values [lsort -real $_values]
+    }
+
+    # Keep all equivalent strings for this value.
+    # That way, we can later select either "1e18" or "1.0e+18"
+    lappend _val2label($value) $label
 
     if {"" == $_current} {
@@ -199 +207 @@
             label {
                 set v [lindex $_values $i]
-                $op rlist $_val2label($v)
+                $op rlist [lindex $_val2label($v) 0]
             }
             value {
@@ -214 +222 @@
                 foreach {min max} [_limits] break
                 set frac [expr {double($v-$min)/($max-$min)}]
-                $op rlist [list $_val2label($v) $v $frac]
+                set l [lindex $_val2label($v) 0]
+                $op rlist [list $l $v $frac]
             }
             default {
@@ -234 +243 @@
     } elseif {[llength $args] == 1} {
         set newval [lindex $args 0]
-        set found 0
-        foreach v $_values {
-            if {[string equal $_val2label($v) $newval]} {
-                set newval $v
-                set found 1
-                break
-            }
-        }
-        if {!$found} {
-            error "bad value \"$newval\": possible matches are \"[join $_values ,]\""
-        }
+        _findLabel $newval  ;# make sure this label is recognized
         _setCurrent $newval
 
@@ -263 +262 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Radiodial::color {value} {
-    set found 0
-    foreach v $_values {
-        if {[string equal $_val2label($v) $value]} {
-            set value $v
-            set found 1
-            break
-        }
-    }
-    if {!$found} {
-        error "bad value \"$value\": possible matches are \"[join $_values ,]\""
-    }
+    _findLabel $value  ;# make sure this label is recognized
 
     if {"" != $_spectrum} {
@@ -300 +289 @@
         upvar #0 $_variable var
         if {[info exists _val2label($value)]} {
-            set var $_val2label($value)
+            set var [lindex $_val2label($value) 0]
         } else {
             set var $value
@@ -422 +411 @@
     set vw $itk_option(-valuewidth)
     if {$vw > 0 && "" != $_current} {
-        set str $_val2label($_current)
+        set str [lindex $_val2label($_current) 0]
         if {[string length $str] >= $vw} {
             set str "[string range $str 0 [expr {$vw-3}]]..."
@@ -436 +425 @@
 
         # set up a tooltip so you can mouse over truncated values
-        Rappture::Tooltip::text $c $_val2label($_current)
+        Rappture::Tooltip::text $c [lindex $_val2label($_current) 0]
         $c bind $id <Enter> \
             [list ::Rappture::Tooltip::tooltip pending %W +$x0,$y1]
@@ -550 +539 @@
 
 # ----------------------------------------------------------------------
+# USAGE: _findLabel <string>
+#
+# Used internally to search for the given <string> label among the
+# known values.  Returns an index into the _values list, or throws
+# an error if the string is not recognized.  Given the null string,
+# it returns -1, indicating that the value is not in _values, but
+# it is valid.
+# ----------------------------------------------------------------------
+itcl::body Rappture::Radiodial::_findLabel {str} {
+    if {"" == $str} {
+        return -1
+    }
+    for {set nv 0} {$nv < [llength $_values]} {incr nv} {
+        set v [lindex $_values $nv]
+        if {[lsearch -exact $_val2label($v) $str] >= 0} {
+            return $nv
+        }
+    }
+    error "bad value \"$str\": should be something matching the raw values \"[join $_values ,]\""
+}
+
+# ----------------------------------------------------------------------
 # USAGE: _fixSize
 #
@@ -615 +626 @@
 
     set newval $var
-    set found 0
-    foreach v $_values {
-        if {[string equal $_val2label($v) $newval]} {
-            set newval $v
-            set found 1
-            break
-        }
-    }
-    if {!$found && "" != $newval} {
-        error "bad value \"$newval\": possible matches are \"[join $_values ,]\""
-    }
+    set n [_findLabel $newval]
+    set newval [expr {($n >= 0) ? [lindex $_values $n] : ""}]
     set _current $newval  ;# set current directly, so we don't trigger again