Changeset 875 for trunk

Timestamp:

Feb 9, 2008, 4:40:47 PM (17 years ago)

Author:

dkearney

Message:

fix for boolean inputs to allow the use of yes/no, true/false, on/off, 1/0.
old applications with boolean inputs may need to be be updated to check for
the proper combination instead of the previous default yes/no.

Location:

trunk

Files:

• examples/zoo/boolean/boolean.tcl (modified) (1 diff)
• examples/zoo/boolean/tool.xml (modified) (1 diff)
• gui/scripts/switch.tcl (modified) (9 diffs)

trunk/examples/zoo/boolean/boolean.tcl

@@ -14 +14 @@
 
 set choice [$driver get input.(iimodel).current]
+$driver put output.boolean(outb).about.label "Echo of boolean value iimodel"
 $driver put output.boolean(outb).current $choice
+
+set choice1 [$driver get input.(iimodel1).current]
+$driver put output.boolean(outb1).about.label "Echo of boolean value iimodel1"
+$driver put output.boolean(outb1).current $choice1
+
+set choice2 [$driver get input.(iimodel2).current]
+$driver put output.boolean(outb2).about.label "Echo of boolean value iimodel2"
+$driver put output.boolean(outb2).current $choice2
+
+set choice3 [$driver get input.(iimodel3).current]
+$driver put output.boolean(outb3).about.label "Echo of boolean value iimodel3"
+$driver put output.boolean(outb3).current $choice3
 
 # save the updated XML describing the run...

trunk/examples/zoo/boolean/tool.xml

@@ -20 +20 @@
       <description>Used to enable/disable the effects of impact ionization on the mobility model.</description>
     </about>
+    <default>on</default>
+  </boolean>
+  <boolean id="iimodel1">
+    <about>
+      <label>Impact Ionization Model</label>
+      <description>Used to enable/disable the effects of impact ionization on the mobility model.</description>
+    </about>
     <default>yes</default>
   </boolean>
+  <boolean id="iimodel2">
+    <about>
+      <label>Impact Ionization Model</label>
+      <description>Used to enable/disable the effects of impact ionization on the mobility model.</description>
+    </about>
+    <default>true</default>
+  </boolean>
+  <boolean id="iimodel3">
+    <about>
+      <label>Impact Ionization Model</label>
+      <description>Used to enable/disable the effects of impact ionization on the mobility model.</description>
+    </about>
+    <default>1</default>
+  </boolean>
 </input>
-<output>
-  <boolean id="outb">
-    <about><label>Echo of boolean value</label></about>
-  </boolean>
-</output>
 </run>

trunk/gui/scripts/switch.tcl

@@ -43 +43 @@
     protected method _hilite {comp state}
     protected method _presets {option}
+    protected method _val2boolstr {args}
 
     private variable _value "no"  ;# value for this widget
@@ -53 +54 @@
     }
 }
-                                                                                
+
 itk::usual Switch {
     keep -cursor -font -foreground -background
@@ -61 +62 @@
 # ----------------------------------------------------------------------
 # CONSTRUCTOR
-# ----------------------------------------------------------------------
-itcl::body Rappture::Switch::constructor {args} {
+#   the type is one of the following: 
+#       "yes", "no",
+#       "true", "false",
+#       "on", "off",
+#       "1", "0",
+#   and determines what text is used as the dropdown options.
+#   if left empty or is a non-boolean value, type defaults to "no"
+# ----------------------------------------------------------------------
+itcl::body Rappture::Switch::constructor {type args} {
     itk_component add icon {
         canvas $itk_interior.icon -borderwidth 0 -highlightthickness 0
@@ -76 +84 @@
     }
 
+    set valNumNeg 2
+    set valNumPos 3
+    set valTextNeg "no"
+    set valTextPos "yes"
+
+    if { ("" != $type) } {
+        set _value $type
+    }
+
+    if { ("on" == $_value) || ("off" == $_value) } {
+        set valNumNeg 4
+        set valNumPos 5
+        set valTextNeg "off"
+        set valTextPos "on"
+    } elseif { ("true" == $_value) || ("false" == $_value) } {
+        set valNumNeg 6
+        set valNumPos 7
+        set valTextNeg "false"
+        set valTextPos "true"
+    } elseif { ("1" == $_value) || ("0" == $_value) } {
+        # assigning values this way avoids a 
+        # "string is integer -strict" problem in _val2boolstr
+        set valNumNeg 0
+        set valNumPos 1
+        set valTextNeg "0"
+        set valTextPos "1"
+    } else {
+        set _value "no"
+    }
+
     itk_component add value {
         label $itk_component(vframe).value -borderwidth 1 -width 7 \
@@ -83 +121 @@
     }
     pack $itk_component(value) -side left -expand yes -fill both
-
-    bind $itk_component(value) <Enter> [itcl::code $this _hilite value on]
-    bind $itk_component(value) <Leave> [itcl::code $this _hilite value off]
 
     itk_component add presets {
@@ -96 +131 @@
     }
 
-    bind $itk_component(presets) <Enter> [itcl::code $this _hilite presets on]
-    bind $itk_component(presets) <Leave> [itcl::code $this _hilite presets off]
+    bind $itk_component(presets) <Enter> [itcl::code $this _hilite presets $valTextPos]
+    bind $itk_component(presets) <Leave> [itcl::code $this _hilite presets $valTextNeg]
 
     itk_component add presetlist {
@@ -104 +139 @@
             -unpostcommand [itcl::code $this _presets unpost] \
     }
-    $itk_component(presetlist) insert end 1 yes 0 no
+
+    $itk_component(presetlist) insert end $valNumPos $valTextPos $valNumNeg $valTextNeg
 
     bind $itk_component(presetlist) <<DropdownlistSelect>> \
@@ -135 +171 @@
 
     if {[llength $args] == 1} {
-        set newval [lindex $args 0]
+
+        set newval [_val2boolstr [lindex $args 0]]
         if {![string is boolean -strict $newval]} {
             error "Should be a boolean value"
         }
-        set newval [expr {($newval) ? "yes" : "no"}]
 
         if {$onlycheck} {
@@ -152 +188 @@
     }
     return $_value
+}
+
+# ----------------------------------------------------------------------
+# USAGE: _val2boolstr <val>
+#
+# Clients use this to query/set the value for this widget.  With
+# no args, it returns the current value for the widget.  If the
+# <newval> is specified, it sets the value of the widget and
+# sends a <<Value>> event.  If the -check flag is included, the
+# new value is not actually applied, but just checked for correctness.
+# ----------------------------------------------------------------------
+itcl::body Rappture::Switch::_val2boolstr {args} {
+    set newval ""
+    if {[llength $args] == 1} {
+        set val [lindex $args 0]
+
+        if {![string is integer -strict $val]} {
+            return $val
+        }
+
+        if { (2 == $val) || (3 == $val) } {
+            set newval [expr {($val%2) ? "yes" : "no"}]
+        } elseif { (4 == $val) || (5 == $val) } {
+            set newval [expr {($val%2) ? "on" : "off"}]
+        } elseif { (6 == $val) || (7 == $val) } {
+            set newval [expr {($val%2) ? "true" : "false"}]
+        } elseif { (0 == $val) || (1 == $val) } {
+            set newval [expr {($val%2) ? "1" : "0"}]
+        }
+
+    } elseif {[llength $args] != 0} {
+        error "wrong # args: should be \"_val2boolstr val\""
+    }
+
+    return $newval
 }