Changeset 1226

Timestamp:

Nov 20, 2008 3:04:58 PM (15 years ago)

Author:

dkearney

Message:

fixing bug where loader fails to show the correct label when using the zoo/loader example.
moving the xml copy from newobj to inside of a similar check to see if the path exists in newobj.
adding example of using the loader copy feature in tcl.

Location:

trunk

Files:

• examples/lang/tcl/loadercopy (added)
• examples/lang/tcl/loadercopy/Makefile.in (added)
• examples/lang/tcl/loadercopy/docs (added)
• examples/lang/tcl/loadercopy/docs/AG.html (added)
• examples/lang/tcl/loadercopy/docs/GAP.html (added)
• examples/lang/tcl/loadercopy/docs/Makefile.in (added)
• examples/lang/tcl/loadercopy/docs/none.html (added)
• examples/lang/tcl/loadercopy/examples (added)
• examples/lang/tcl/loadercopy/examples/Makefile.in (added)
• examples/lang/tcl/loadercopy/examples/materials-dielectric-GAP.xml (added)
• examples/lang/tcl/loadercopy/examples/materials-metal-AG.xml (added)
• examples/lang/tcl/loadercopy/loadercopy.tcl (added)
• examples/lang/tcl/loadercopy/tool.xml (added)
• gui/scripts/controlOwner.tcl (modified) (2 diffs)

trunk/gui/scripts/controlOwner.tcl

@@ -275 +275 @@
 
         # copy new value to the XML tree
+        # also copy to the widget associated with the tree
+        #
         # we only copy the values if they existed in newobj
         # so we don't overwrite values that were set in previous loads.
@@ -287 +289 @@
         # newobj and see if the path exists. if the path exists, then we copy
         # it over to [tool] xml, otherwise we ignore it.
-        if {"" != [$newobj element -as component $currentpath]} {
+        if {"" != [$newobj element -as type $currentpath]} {
             [tool] xml copy $currentpath from $newobj $currentpath
-        }
-
-        # also copy to the widget associated with the tree
-        if {"" != [$newobj element -as type $path]} {
             set val [$newobj get $currentpath]
             if {[string length $val] > 0