Changeset 903 for trunk/gui

Timestamp:

Feb 23, 2008, 8:16:38 PM (17 years ago)

Author:

mmc

Message:

Final tweaks on the optimization package. The demo now works properly.
Just run "wish simple.tcl" to see it work.

Fixed the Tool class to work better with the optimizer. The "run"
method now returns the result directly as a Rappture::Library object,
and the Analyzer merely loads the object.

Location:

trunk/gui/scripts

Files:

• analyzer.tcl (modified) (5 diffs)
• tool.tcl (modified) (3 diffs)

trunk/gui/scripts/analyzer.tcl

@@ -52 +52 @@
     public method simulate {args}
     public method reset {{when -eventually}}
-    public method load {file}
+    public method load {xmlobj}
     public method clear {}
     public method download {option args}
@@ -77 +77 @@
 
     private common job                 ;# array var used for blt::bgexec jobs
-
-    # resources file tells us the results directory
-    public common _resultdir ""
-    public proc setResultDir {path} { set _resultdir $path }
-}
-
-# must use this name -- plugs into Rappture::resources::load
-proc analyzer_init_resources {} {
-    Rappture::resources::register \
-        results_directory Rappture::Analyzer::setResultDir
-}
-                                                                                
+}
+
 itk::usual Analyzer {
     keep -background -cursor foreground -font
@@ -354 +344 @@
     }
 
-    # read back the results from run.xml
+    # load results from run.xml into analyzer
     if {$status == 0 && $result != "ABORT"} {
-        if {[regexp {=RAPPTURE-RUN=>([^\n]+)} $result match file]} {
-            set status [catch {load $file} msg]
-            if {$status != 0} {
-                global errorInfo
-                set result "$msg\n$errorInfo"
-            }
-
-            # if there's a results_directory defined in the resources
-            # file, then move the run.xml file there for storage
-            if {"" != $_resultdir} {
-                catch {
-                    if {![file exists $_resultdir]} {
-                        _mkdir $_resultdir
-                    }
-                    file rename -force -- $file $_resultdir
-                }
-            }
-        } else {
-            set status 1
-            set result "Can't find result file in output.\nDid you call Rappture::result in your simulator?"
-        }
+        set status [catch {load $result} result]
     }
 
@@ -441 +411 @@
 
 # ----------------------------------------------------------------------
-# USAGE: load <file>
-#
-# Loads the data from the given <file> into the appropriate results
+# USAGE: load <xmlobj>
+#
+# Loads the data from the given <xmlobj> into the appropriate results
 # sets.  If necessary, new results sets are created to store the data.
 # ----------------------------------------------------------------------
-itcl::body Rappture::Analyzer::load {file} {
+itcl::body Rappture::Analyzer::load {xmlobj} {
     # only show the last result? then clear first
     if {[$_tool xml get tool.analyzer] == "last"} {
@@ -452 +422 @@
     }
 
-    # try to load new results from the given file
-    set xmlobj [Rappture::library $file]
     lappend _runs $xmlobj
 

trunk/gui/scripts/tool.tcl

@@ -40 +40 @@
 
     public common _resources
-    public proc setAppName {name} { set _resources(-appname) $name }
-    public proc setHubName {name} { set _resources(-hubname) $name }
-    public proc setHubURL {name}  { set _resources(-huburl) $name }
-    public proc setSession {name} { set _resources(-session) $name }
-    public proc setJobPrt {name}  { set _resources(-jobprotocol) $name }
+    public proc setAppName {name}   { set _resources(-appname) $name }
+    public proc setHubName {name}   { set _resources(-hubname) $name }
+    public proc setHubURL {name}    { set _resources(-huburl) $name }
+    public proc setSession {name}   { set _resources(-session) $name }
+    public proc setJobPrt {name}    { set _resources(-jobprotocol) $name }
+    public proc setResultDir {name} { set _resources(-resultdir) $name }
 }
 
@@ -50 +51 @@
 proc tool_init_resources {} {
     Rappture::resources::register \
-        application_name Rappture::Tool::setAppName \
-        application_id   Rappture::Tool::setAppId \
-        hub_name         Rappture::Tool::setHubName \
-        hub_url          Rappture::Tool::setHubURL \
-        session_token    Rappture::Tool::setSession \
-        job_protocol     Rappture::Tool::setJobPrt
+        application_name  Rappture::Tool::setAppName \
+        application_id    Rappture::Tool::setAppId \
+        hub_name          Rappture::Tool::setHubName \
+        hub_url           Rappture::Tool::setHubURL \
+        session_token     Rappture::Tool::setSession \
+        job_protocol      Rappture::Tool::setJobPrt \
+        results_directory Rappture::Tool::setResultDir
 }
                                                                                 
@@ -263 +265 @@
     #
     if {$status == 0} {
-        set file [string trim $job(output)]
-        return [list $status $file]
+        set result [string trim $job(output)]
+        if {[regexp {=RAPPTURE-RUN=>([^\n]+)} $result match file]} {
+            set status [catch {Rappture::library $file} result]
+            if {$status != 0} {
+                global errorInfo
+                set result "$result\n$errorInfo"
+            }
+
+            # if there's a results_directory defined in the resources
+            # file, then move the run.xml file there for storage
+            if {[info exists _resources(-resultdir)]
+                  && "" != $_resources(-resultdir)} {
+                catch {
+                    if {![file exists $_resources(-resultdir)]} {
+                        _mkdir $_resources(-resultdir)
+                    }
+                    file rename -force -- $file $_resources(-resultdir)
+                }
+            }
+        } else {
+            set status 1
+            set result "Can't find result file in output.\nDid you call Rappture
+::result in your simulator?"
+        }
+        return [list $status $result]
     } elseif {"" != $job(output) || "" != $job(error)} {
         return [list $status [string trim "$job(output)\n$job(error)"]]