Changeset 1207 for trunk

Timestamp:

Nov 5, 2008 12:15:09 PM (16 years ago)

Author:

dkearney

Message:

adding functionality to more dynamically change the contents of a note. this is helpful if you have a loader to choose materials, and a note for each material. when the user changes the material, the contents of the note (which describes the material) can change as well. this is used in the dev version of photonicsdb

Location:

trunk/gui/scripts

Files:

• controlOwner.tcl (modified) (3 diffs)
• note.tcl (modified) (1 diff)

trunk/gui/scripts/controlOwner.tcl

@@ -40 +40 @@
     private variable _path2widget    ;# maps path => widget on this page
     private variable _owner2paths    ;# for notify: maps owner => interests
+    private variable _type2curpath   ;# maps type(path) => path's current value
     private variable _callbacks      ;# for notify: maps owner/path => callback
     private variable _dependencies   ;# maps path => other paths dep on this
 }
-                                                                                
+
 # ----------------------------------------------------------------------
 # CONSTRUCTOR
@@ -53 +54 @@
         set _path [lindex $parts 1]
         $_owner _slave add $this
+    }
+
+    # we are adding this so notes can be used
+    # in coordination with loaders inside the load function
+    array set _type2curpath {
+        choice current
+        boolean current
+        image current
+        integer current
+        loader current
+        note contents
+        number current
+        string current
     }
 }
@@ -248 +262 @@
         # the following elements do not accept "current" tags, skip them
         set type [[tool] xml element -as type $path]
-        if {[lsearch {group separator control note} $type] >= 0} {
+        if {[lsearch {group separator control} $type] >= 0} {
             continue
         }
 
+        set type [[tool] xml element -as type $path]
+        if {[info exists _type2curpath($type)]} {
+            set currentpath $path.$_type2curpath($type)
+        } else {
+            # default incase i forgot an inpuit type in _type2curpath
+            set currentpath $path.current
+        }
+
         # copy new value to the XML tree
-        [tool] xml copy $path.current from $newobj $path.current
+        [tool] xml copy $currentpath from $newobj $currentpath
 
         # also copy to the widget associated with the tree
-        if {"" != [$newobj element -as type $path.current]} {
-            set val [$newobj get $path.current]
+        if {"" != [$newobj element -as type $path]} {
+            set val [$newobj get $currentpath]
             if {[string length $val] > 0
-                  || [llength [$newobj children $path.current]] == 0} {
+                  || [llength [$newobj children $currentpath]] == 0} {
                 $_path2widget($path) value $val
             } else {
-                set obj [$newobj element -as object $path.current]
+                set obj [$newobj element -as object $currentpath]
                 $_path2widget($path) value $obj
             }

trunk/gui/scripts/note.tcl

@@ -80 +80 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Note::value {args} {
-    error "can't set value"
+    set onlycheck 0
+    set i [lsearch -exact $args -check]
+    if {$i >= 0} {
+        set onlycheck 1
+        set args [lreplace $args $i $i]
+    }
+
+    if {[llength $args] == 1} {
+        if {$onlycheck} {
+            # someday we may add validation...
+            return
+        }
+        set newval [lindex $args 0]
+        _setContents $newval
+        return $newval
+
+    } elseif {[llength $args] != 0} {
+        error "wrong # args: should be \"value ?-check? ?newval?\""
+    }
+
+    #
+    # Query the value and return.
+    #
+    error "don't know how to check value of <note>"
+    return
 }