Changeset 6 for trunk/gui/apps/driver

Timestamp:

Mar 23, 2005 8:19:29 PM (19 years ago)

Author:

mmc

Message:

Fixed the Tcl library to mirror the API developed for XML
libraries on the Python side. The Tcl Rappture::library
now has methods like "children", "element", "put", etc.
One difference: On the Tcl side, the default -flavor for
element/children is "component", since that works better
in Tcl code. In Python, the default is flavor=object.

Also fixed the Tcl install script to install not just
the tcl/scripts library, but also the ../gui and ../lib
directories.

File:

• trunk/gui/apps/driver (modified) (8 diffs)

trunk/gui/apps/driver

@@ -82 +82 @@
 
 # open the XML file containing the material library
-set lib [Rappture::Library::open -std library.xml]
+set lib [Rappture::library -std library.xml]
                                                                                 
 # open the XML file containing the tool parameters
@@ -89 +89 @@
     exit 1
 }
-set tool [Rappture::Library::open $toolfile]
+set tool [Rappture::library $toolfile]
                                                                                 
 # open the XML file containing the configuration for this application
@@ -96 +96 @@
     exit 1
 }
-set config [Rappture::Library::open $configfile]
+set config [Rappture::library $configfile]
 
 # ----------------------------------------------------------------------
@@ -148 +148 @@
 # ----------------------------------------------------------------------
 set w $win.input
-set ndevs [$config get -count controls.device]
-if {$ndevs > 0} {
-    for {set i 0} {$i < $ndevs} {incr i} {
-        set obj [$config get -object controls.device$i]
+set dfirst ""
+set dlist [$config children -type structure controls]
+if {"" != $dlist} {
+    foreach dname $dlist {
+        set obj [$config element -flavor object controls.$dname]
         set name [$obj get label]
         set devs($name) $obj
@@ -157 +158 @@
     set devlist [lsort [array names devs]]
 
-    if {$ndevs > 1} {
+    if {[array size devs] > 1} {
         frame $w.devsel
         pack $w.devsel -side top -fill x
@@ -173 +174 @@
 
     set first [lindex $devlist 0]
+    set dfirst $devs($first)
     Rappture::DeviceViewer1D $w.device -device $devs($first) \
         -tool $tool -library $lib
@@ -185 +187 @@
 set w $win.output
 Rappture::Analyzer $w.analyze -holdwindow $win.input \
-    -tool $tool -analysis [$config get -object analysis] \
-    -device $devs($first)
+    -tool $tool -analysis [$config element -flavor object analysis] \
+    -device $dfirst
 pack $w.analyze -expand yes -fill both
 
@@ -192 +194 @@
 # HOOK UP ANY CONTROLS CALLED OUT IN CONFIG.XML
 # ----------------------------------------------------------------------
-set ncntls [$config get -count controls.access]
-for {set i 0} {$i < $ncntls} {incr i} {
-    set name [$config get access$i]
+foreach access [$config children -type access controls] {
+    set name [$config get controls.$access]
     switch -glob -- $name {
-        parameters.ambient* - device* {
+        parameters.ambient* - structure* {
             $win.input.device controls add $name
         }