Changeset 1625 for trunk/gui/scripts/periodicelement.tcl

Timestamp:

Dec 16, 2009, 4:19:54 PM (15 years ago)

Author:

gah

Message:

 

File:

• trunk/gui/scripts/periodicelement.tcl (modified) (4 diffs)

trunk/gui/scripts/periodicelement.tcl

@@ -55 +55 @@
            0xfe, 0x7c, 0x38, 0x10};
     }
-    private variable _value2label
-    private variable _label2value
+
+    private variable _lastValue ""
 }
                                                                                 
@@ -98 +98 @@
     bind $itk_component(entry) <KeyPress-Return> \
         [itcl::code $this _entry apply]
+    bind $itk_component(entry) <KeyPress-Tab> \
+        [itcl::code $this _entry apply]
     bind $itk_component(entry) <ButtonPress> \
         [itcl::code $this _entry click]
@@ -126 +128 @@
 itcl::body Rappture::PeriodicElement::value {args} {
     if {[llength $args] == 1} {
-        set newval [lindex $args 0]
-
-        $itk_component(entry) configure -state normal
-        $itk_component(entry) delete 0 end
-        $itk_component(entry) insert 0 $newval
-        if {!$itk_option(-editable)} {
-            $itk_component(entry) configure -state disabled
-        }
-
+        set value [lindex $args 0]
+    } elseif { [llength $args] == 0 }  {
+        set value [$itk_component(entry) get]
+    } else {
+        error "wrong # args: should be \"value ?newval?\""
+    }
+    set value [$itk_component(ptable) get $value]
+    if { $value == "" } {
+        set value $_lastValue
+        bell
+    }
+    $itk_component(entry) configure -state normal
+    $itk_component(entry) delete 0 end
+    $itk_component(entry) insert 0 $value
+    if {!$itk_option(-editable)} {
+        $itk_component(entry) configure -state disabled
+    }
+    set _lastValue $value
+    if { [llength $args] == 1 } {
         after 10 \
             [list catch [list event generate $itk_component(hull) <<Value>>]]
-    } elseif {[llength $args] != 0} {
-        error "wrong # args: should be \"value ?newval?\""
-    }
-    return [$itk_component(entry) get]
+    } 
+    return $value
 }
 
@@ -225 +235 @@
         }
         select {
-            puts stderr "called selected [$itk_component(ptable) get -all]"
             set value [$itk_component(ptable) get -name]
             if {"" != $value} {