Changeset 1159 for trunk/gui/apps/driver

Timestamp:

Sep 22, 2008, 5:41:59 PM (16 years ago)

Author:

dkearney

Message:

updated driver to allow the user to revisualize old run files just as rerun did. if driver can find the tool.xml file and where the application is installed, it can also allow the user to run new simulations after preloading old simulations.

Finally figured out where the current tags in group objects were coming from. controlOwner was adjusted to stop putting current tags in things. this only seemed to happen when the application also contained a loader, because we were doing an xml copy of nodes.

rewrote rerun to be a small wrapper around the "driver -load" command. rerun is now a script like rappture, it is populated with rappture's install directory from configure, so configure.in was updated. added some stuff for finding mcc in the configure.in script for a future commit

changed Rappture::Analyzer to accept -notebookpage configure flag so we can specify which page of the analyzer notebook should be currently showing. also inside of the analyzer, changed behavior of simstatus to allow us to still show a message even if the simulation button is disabled. this is helpful because we can tell the user why the simulation button is grayed out. one example of this is the case when we load old run.xml files, but cannot find a tool.xml file. the user cannot run a simulation, even if they change an input, because we can't figure out where the app is installed. now we can tell the user, why they cannot run the simulation.

File:

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

trunk/gui/apps/driver

@@ -85 +85 @@
 Rappture::getopts argv params {
     value -tool tool.xml
+    value -load ""
+    value -nosim 0
+}
+
+# rewrite out params(-load) variable with a properly split list of files
+array set params [list -load [split $params(-load) ","]]
+
+set loadobjs {}
+foreach runfile $params(-load) {
+    if {![file exists $runfile]} {
+        puts stderr "can't find run: \"$runfile\""
+        exit 1
+    }
+    set status [catch {Rappture::library $runfile} result]
+    lappend loadobjs $result
 }
 
 # open the XML file containing the tool parameters
 if {![file exists $params(-tool)]} {
-    puts stderr "can't find tool \"$params(-tool)\""
-    exit 1
-}
+    # check to see if the user specified any run.xml files to load.
+    # if so, we can use that as the tool.xml. if we can find where
+    # the original application was installed using the xml tag
+    # tool.version.application.directory(top), the user can
+    # run new simulations, otherwise they can only revisualize the
+    # run.xml files they are loading.
+    set pseudotool ""
+    set lflen [llength $loadobjs)]
+    if {0 == $lflen} {
+        puts stderr "can't find tool \"$params(-tool)\""
+        exit 1
+    }
+    if {!$params(-nosim)} {
+        foreach runobj $loadobjs {
+            set tdir [$runobj get tool.version.application.directory(tool)]
+            if {[file isdirectory $tdir] && \
+                [file exists $tdir/tool.xml]} {
+                set pseudotool $tdir/tool.xml
+                break
+            }
+        }
+    }
+    if {![file exists $pseudotool]} {
+        # we didn't find a tool.xml file,
+        # use info from a runfile to build gui
+        # disable simulation, because no tool.xml
+        set pseudotool [lindex $params(-load) 0]
+        array set params [list -nosim true]
+    }
+    if {![file exists $pseudotool]} {
+        puts stderr "can't find tool \"$params(-tool)\""
+        exit 1
+    }
+    array set params [list -tool $pseudotool]
+}
+
 set xmlobj [Rappture::library $params(-tool)]
 
@@ -201 +249 @@
 }]
 
-Rappture::Analyzer $f.analyze $tool -simcontrol auto
+# can we call analyzer without specifying -notebookpage?
+Rappture::Analyzer $f.analyze $tool -simcontrol auto -notebookpage about
 pack $f.analyze -expand yes -fill both
 
@@ -236 +285 @@
     }
 }
+
+# load previous xml runfiles
+if {0 != [llength $params(-load)]} {
+    foreach runobj $loadobjs {
+        $f.analyze load $runobj
+    }
+    $f.analyze configure -notebookpage analyze
+    if {$params(-nosim)} {
+        $f.analyze configure -simcontrol off
+    }
+}
+
 wm deiconify .main