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

Timestamp:

Apr 26, 2006, 6:42:46 PM (18 years ago)

Author:

mmc

Message:

• Added <description> capability to output objects, including axes.

• Fixed the ResultSet? so that it is more compact and supports the simulation number as a parameter. This is useful when there are datasets with wildly varying parameters.

File:

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

trunk/gui/scripts/radiodial.tcl

@@ -29 +29 @@
     itk_option define -min min Min ""
     itk_option define -max max Max ""
+    itk_option define -variable variable Variable ""
+
     itk_option define -thickness thickness Thickness 0
     itk_option define -length length Length 0
@@ -50 +52 @@
     public method color {value}
                                                                                 
+    protected method _setCurrent {val}
     protected method _redraw {}
     protected method _click {x y}
@@ -55 +58 @@
     protected method _limits {}
     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 _current ""      ;# current value (where pointer is)
+    private variable _variable ""     ;# variable associated with -variable
 
     private variable _spectrum ""     ;# width allocated for values
@@ -103 +108 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Radiodial::destructor {} {
+    configure -variable ""  ;# remove variable trace
     after cancel [itcl::code $this _redraw]
 }
@@ -123 +129 @@
 
     if {"" == $_current} {
-        set _current $value
+        _setCurrent $value
     }
 
@@ -137 +143 @@
 itcl::body Rappture::Radiodial::clear {} {
     set _values ""
-    set _current ""
+    _setCurrent ""
     catch {unset _val2label}
 
@@ -168 +174 @@
         set ilist ""
         for {set i 0} {$i < [llength $_values]} {incr i} {
-            append ilist $i
+            lappend ilist $i
         }
     } elseif {"current" == $index} {
@@ -235 +241 @@
             error "bad value \"$newval\""
         }
-        set _current $newval
+        _setCurrent $newval
 
         after cancel [itcl::code $this _redraw]
@@ -277 +283 @@
     }
     return $color
+}
+
+# ----------------------------------------------------------------------
+# USAGE: _setCurrent <value>
+#
+# Called automatically whenever the widget changes size to redraw
+# all elements within it.
+# ----------------------------------------------------------------------
+itcl::body Rappture::Radiodial::_setCurrent {value} {
+    set _current $value
+    if {"" != $_variable} {
+        upvar #0 $_variable var
+        if {[info exists _val2label($value)]} {
+            set var $_val2label($value)
+        } else {
+            set var $value
+        }
+    }
 }
 
@@ -389 +413 @@
 
         if {$vnearest != $_current} {
-            set _current $vnearest
+            _setCurrent $vnearest
             _redraw
 
@@ -417 +441 @@
         set newval [lindex $_values $index]
         if {$newval != $_current} {
-            set _current $newval
+            _setCurrent $newval
             _redraw
 
@@ -482 +506 @@
 
 # ----------------------------------------------------------------------
+# USAGE: _fixValue ?<name1> <name2> <op>?
+#
+# Invoked automatically whenever the -variable associated with this
+# widget is modified.  Copies the value to the current settings for
+# the widget.
+# ----------------------------------------------------------------------
+itcl::body Rappture::Radiodial::_fixValue {args} {
+    if {"" == $itk_option(-variable)} {
+        return
+    }
+    upvar #0 $itk_option(-variable) var
+
+    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\""
+    }
+    set _current $newval  ;# set current directly, so we don't trigger again
+
+    after cancel [itcl::code $this _redraw]
+    after idle [itcl::code $this _redraw]
+    event generate $itk_component(hull) <<Value>>
+}
+
+# ----------------------------------------------------------------------
 # CONFIGURE: -thickness
 # ----------------------------------------------------------------------
@@ -509 +565 @@
         error "bad value \"$itk_option(-valuewidth)\": should be integer"
     }
+    _fixSize
     after cancel [itcl::code $this _redraw]
     after idle [itcl::code $this _redraw]
@@ -554 +611 @@
     after idle [itcl::code $this _redraw]
 }
+
+# ----------------------------------------------------------------------
+# CONFIGURE: -variable
+# ----------------------------------------------------------------------
+itcl::configbody Rappture::Radiodial::variable {
+    if {"" != $_variable} {
+        upvar #0 $_variable var
+        trace remove variable var write [itcl::code $this _fixValue]
+    }
+
+    set _variable $itk_option(-variable)
+
+    if {"" != $_variable} {
+        upvar #0 $_variable var
+        trace add variable var write [itcl::code $this _fixValue]
+
+        # sync to the current value of this variable
+        if {[info exists var]} {
+            _fixValue
+        }
+    }
+}