Changeset 1217

Timestamp:

Nov 14, 2008 1:23:24 PM (15 years ago)

Author:

dkearney

Message:

adding ability to specify runfiles to be either loaded or included with the
results of the current simulation. loading a runfile will simply call the tool object's load function within analyzer and the runfile will be loaded as a previous simulation result. including a runfile involves copying the results (everything under output) from the runfile into the current run.xml file and all of the results are shown as one single simulation.

This behavior is demonstrated in the zoo's loadrun example.

Location:

trunk

Files:

• examples/zoo/loadrun (added)
• examples/zoo/loadrun/Makefile.in (added)
• examples/zoo/loadrun/loadrun.tcl (added)
• examples/zoo/loadrun/run10.xml (added)
• examples/zoo/loadrun/run20.xml (added)
• examples/zoo/loadrun/run5.xml (added)
• examples/zoo/loadrun/tool.xml (added)
• gui/scripts/analyzer.tcl (modified) (1 diff)

trunk/gui/scripts/analyzer.tcl

@@ -429 +429 @@
     if {[$_tool xml get tool.analyzer] == "last"} {
         clear
+    }
+
+    # look for all output.load children and load them first
+    # each run.xml is loaded as a previous simulation.
+    foreach item [$xmlobj children -type run output.load] {
+        set loadfile [$xmlobj get output.load.$item]
+        set loadobj [Rappture::library $loadfile]
+        load $loadobj
+    }
+
+    foreach item [$xmlobj children -type run output.include] {
+        set id [$xmlobj element -as id output.include.$item]
+        set inclfile [$xmlobj get output.include.$item]
+        set inclobj [Rappture::library $inclfile]
+        foreach c [$inclobj children output] {
+            switch -glob -- $c {
+                # we don't want to include these tags
+                include* - time* - status* - user* {
+                    continue
+                }
+                default {
+                    set oldid [$inclobj element -as id output.$c]
+                    set oldtype [$inclobj element -as type output.$c]
+                    set newcomp "$oldtype\($id-$oldid\)"
+                    $xmlobj copy output.$newcomp from $inclobj output.$c
+                }
+            }
+        }
     }