Changeset 429

Timestamp:

May 4, 2006, 7:37:34 PM (18 years ago)

Author:

mmc

Message:

Fixed the <choice> input so that each option can have a description
that shows up in a tooltip. Also, added a <value> that can be used
instead of the <label> to represent the current choice.

Location:

trunk

Files:

• examples/zoo/choice/tool.xml (modified) (1 diff)
• gui/scripts/choiceentry.tcl (modified) (7 diffs)

trunk/examples/zoo/choice/tool.xml

@@ -20 +20 @@
       <description>Determines the model for carrier statistics used in bandgap narrowing calculations.</description>
     </about>
-    <option> <about><label>Boltzmann</label></about> </option>
-    <option> <about><label>Fermi</label></about> </option>
-    <option> <about><label>2D Gas</label></about> </option>
+    <option>
+      <about>
+        <label>Boltzmann</label>
+        <description>From the Boltzmann transport equation</description>
+      </about>
+      <value>bte</value>
+    </option>
+    <option>
+      <about>
+        <label>Fermi</label>
+        <description>Fermi-Dirac statistics</description>
+      </about>
+    </option>
+    <option>
+      <about>
+        <label>2D Gas</label>
+        <description>Includes confinement at material interface</description>
+      </about>
+      <value>2deg</value>
+    </option>
     <default>Boltzmann</default>
   </choice>

trunk/gui/scripts/choiceentry.tcl

@@ -30 +30 @@
     private variable _owner ""    ;# thing managing this control
     private variable _path ""     ;# path in XML to this number
+    private variable _str2val     ;# maps option label => option value
 }
 
@@ -94 +95 @@
         }
         set newval [lindex $args 0]
-        $itk_component(choice) value $newval
+        if {[info exists _str2val($newval)]} {
+            # this is a label -- use it directly
+            $itk_component(choice) value $newval
+            set newval $_str2val($newval)  ;# report the actual value
+        } else {
+            # this is a value -- search for corresponding label
+            foreach str [array names _str2val] {
+                if {$_str2val($str) == $newval} {
+                    $itk_component(choice) value $str
+                    break
+                }
+            }
+        }
         return $newval
 
@@ -104 +117 @@
     # Query the value and return.
     #
-    return [$itk_component(choice) value]
+    set str [$itk_component(choice) value]
+    if {[info exists _str2val($str)]} {
+        return $_str2val($str)
+    }
+    return $str
 }
 
@@ -145 +162 @@
     # get rid of any existing choices
     $itk_component(choice) choices delete 0 end
+    catch {unset _str2val}
 
     #
@@ -202 +220 @@
             # Add the label as-is into the list of choices.
             #
+            set val [string trim [$_owner xml get $_path.$cname.value]]
             set str [string trim [$_owner xml get $_path.$cname.about.label]]
+            if {"" == $val} {
+                set val $str
+            }
             if {"" != $str} {
+                set _str2val($str) $val
                 $itk_component(choice) choices insert end $_path.$cname $str
                 set len [string length $str]
@@ -215 +238 @@
     # Assign the default value to this widget, if there is one.
     #
-    set str [$_owner xml get $_path.default]
-    if {"" != $str} { $itk_component(choice) value $str }
+    set defval [$_owner xml get $_path.default]
+    if {"" != $defval} {
+        if {[info exists _str2val($defval)]} {
+            $itk_component(choice) value $defval
+        } else {
+            foreach str [array names _str2val] {
+                if {$_str2val($str) == $defval} {
+                    $itk_component(choice) value $str
+                    break
+                }
+            }
+        }
+    }
 }
 
@@ -242 +276 @@
     set str [$itk_component(choice) value]
     set path [$itk_component(choice) translate $str]
-
-    if {"" != $str} {
-        append tip "\n\n$str:"
-
-        if {$path != ""} {
-            set desc [$_owner xml get $path.description]
-            if {[string length $desc] > 0} {
-                append tip "\n$desc"
-            }
-        }
+    set desc ""
+    if {$path != ""} {
+        set desc [$_owner xml get $path.about.description]
+    }
+
+    if {[string length $str] > 0 && [string length $desc] > 0} {
+        append tip "\n\n$str:\n$desc"
     }
     return $tip