Changeset 2164 for trunk/gui

Timestamp:

Mar 28, 2011, 9:34:33 PM (13 years ago)

Author:

mmc

Message:

Fixed the way the Tool object resets itself before a run. Each Tool takes
a snapshot of the original XML file, and copies that clean snapshot back
into the working XML whenever the tool is reset. This cleans out any junk
from previous runs. This was an issue in the regression tester, where one
test case might have an extra input and all test cases that ran after that
would keep that extra input junk around. Each test starts cleanly now.

File:

• trunk/gui/scripts/tool.tcl (modified) (6 diffs)

trunk/gui/scripts/tool.tcl

@@ -24 +24 @@
     } { # defined below }
 
+    destructor { # defined below }
+
     public method installdir {} { return $_installdir }
 
@@ -33 +35 @@
     protected method _output {data}
 
+    private variable _origxml ""     ;# copy of original XML (for reset)
     private variable _installdir ""  ;# installation directory for this tool
     private variable _outputcb ""    ;# callback for tool output
@@ -61 +64 @@
         results_directory Rappture::Tool::setResultDir
 }
-                                                                                
+
 # ----------------------------------------------------------------------
 # CONSTRUCTOR
@@ -71 +74 @@
     set _xmlobj $xmlobj
 
+    # stash a copy of the original XML for later "reset" operations
+    set _origxml [Rappture::LibraryObj ::#auto "<?xml version=\"1.0\"?><run/>"]
+    $_origxml copy "" from $_xmlobj ""
+
     if {![file exists $installdir]} {
         error "directory \"$installdir\" doesn't exist"
@@ -77 +84 @@
 
     eval configure $args
+}
+
+# ----------------------------------------------------------------------
+# DESTRUCTOR
+# ----------------------------------------------------------------------
+itcl::body Rappture::Tool::destructor {} {
+    itcl::delete object $_origxml
 }
 
@@ -334 +348 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Tool::reset {} {
+    $_xmlobj copy "" from $_origxml ""
     foreach path [Rappture::entities -as path $_xmlobj input] {
         if {[$_xmlobj element -as type $path.default] ne ""} {