Changeset 22 for trunk/gui/scripts/numberentry.tcl

Timestamp:

Jul 16, 2005, 2:31:32 PM (19 years ago)

Author:

mmc

Message:

Lots of changes to support Huckel-IV:

• Support for embedded <tool> declarations
• New <integer> entry
• Support for numbers and structures as output elements
• Atom numbers/symbols in MoleculeViewer?

File:

• trunk/gui/scripts/numberentry.tcl (modified) (9 diffs)

trunk/gui/scripts/numberentry.tcl

@@ -14 +14 @@
     inherit itk::Widget
 
-    constructor {xmlobj path args} { # defined below }
+    constructor {owner path args} { # defined below }
 
     public method value {args}
@@ -23 +23 @@
     protected method _newValue {}
 
-    private variable _xmlobj ""   ;# XML containing description
+    private variable _owner ""    ;# thing managing this control
     private variable _path ""     ;# path in XML to this number
 }
@@ -37 +37 @@
 # CONSTRUCTOR
 # ----------------------------------------------------------------------
-itcl::body Rappture::NumberEntry::constructor {xmlobj path args} {
-    if {![Rappture::library isvalid $xmlobj]} {
-        error "bad value \"$xmlobj\": should be Rappture::library"
-    }
-    set _xmlobj $xmlobj
+itcl::body Rappture::NumberEntry::constructor {owner path args} {
+    if {[catch {$owner isa Rappture::ControlOwner} valid] != 0 || !$valid} {
+        error "bad object \"$owner\": should be Rappture::ControlOwner"
+    }
+    set _owner $owner
     set _path $path
 
@@ -48 +48 @@
     #
     set presets ""
-    foreach pre [$xmlobj children -type preset $path] {
+    foreach pre [$_owner xml children -type preset $path] {
         lappend presets \
-            [$xmlobj get $path.$pre.value] \
-            [$xmlobj get $path.$pre.label]
+            [$_owner xml get $path.$pre.value] \
+            [$_owner xml get $path.$pre.label]
     }
 
     set class Rappture::Gauge
-    set units [$xmlobj get $path.units]
+    set units [$_owner xml get $path.units]
     if {$units != ""} {
         set desc [Rappture::Units::description $units]
@@ -73 +73 @@
     bind $itk_component(gauge) <<Value>> [itcl::code $this _newValue]
 
-    set min [$xmlobj get $path.min]
+    set min [$_owner xml get $path.min]
     if {"" != $min} { $itk_component(gauge) configure -minvalue $min }
 
-    set max [$xmlobj get $path.max]
+    set max [$_owner xml get $path.max]
     if {"" != $max} { $itk_component(gauge) configure -maxvalue $max }
 
     if {$class == "Rappture::Gauge" && "" != $min && "" != $max} {
-        set color [$xmlobj get $path.color]
+        set color [$_owner xml get $path.color]
         if {$color == ""} {
             set color blue
@@ -94 +94 @@
 
     # if the control has an icon, plug it in
-    set str [$xmlobj get $path.about.icon]
+    set str [$_owner xml get $path.about.icon]
     if {$str != ""} {
         $itk_component(gauge) configure -image [image create photo -data $str]
@@ -104 +104 @@
     # Assign the default value to this widget, if there is one.
     #
-    set str [$xmlobj get $path.default]
+    set str [$_owner xml get $path.default]
     if {"" != $str != ""} { $itk_component(gauge) value $str }
 }
@@ -151 +151 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::NumberEntry::label {} {
-    set label [$_xmlobj get $_path.about.label]
+    set label [$_owner xml get $_path.about.label]
     if {"" == $label} {
         set label "Number"
@@ -167 +167 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::NumberEntry::tooltip {} {
-    set str [$_xmlobj get $_path.about.description]
-
-    set units [$_xmlobj get $_path.units]
-    set min [$_xmlobj get $_path.min]
-    set max [$_xmlobj get $_path.max]
+    set str [$_owner xml get $_path.about.description]
+
+    set units [$_owner xml get $_path.units]
+    set min [$_owner xml get $_path.min]
+    set max [$_owner xml get $_path.max]
 
     if {$units != "" || $min != "" || $max != ""} {