Changeset 4961 for trunk/gui/scripts/main.tcl

Timestamp:

Jan 29, 2015, 6:55:17 PM (10 years ago)

Author:

mmc

Message:

Fixed the way that Rappture handles tool parameters. When Rappture starts
up, it looks for the TOOL_PARAMETERS environment variable and loads values
from that file. Any "file" parameters are used to load driver files, run
files, or data into controls. See ​http://rappture.org/wiki/RapptureApi
for details.

File:

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

trunk/gui/scripts/main.tcl

@@ -93 +93 @@
     value -tool tool.xml
     list  -load ""
+    value -input ""
     value -nosim 0
-}
-
-proc ReadToolParameters { numTries } {
-    incr numTries -1 
-    if { $numTries < 0 } {
-        return
-    }
-    global env
-    set paramsFile $env(TOOL_PARAMETERS)
-    if { ![file readable $paramsFile] } {
-        after 500 ReadToolParmeters $numTries
-        return
-    }
-    catch { 
-        set f [open $paramsFile "r"]
-        set contents [read $f]
-        close $f
-        set pattern {^file\((.*)\):(.*)$} 
-        foreach line [split $contents "\n"] {
-            if { [regexp $pattern $line match path rest] } {
-                set ::Rappture::parameters($path) $rest
-            }
-        }
-    }
-}
-
-if { [info exists env(TOOL_PARAMETERS)] } {
-    ReadToolParameters 10
 }
 
@@ -132 +105 @@
     set status [catch {Rappture::library $runfile} result]
     lappend loadobjs $result
+}
+
+set inputobj {}
+if {$params(-input) ne ""} {
+    if {![file exists $params(-input)]} {
+        puts stderr "can't find input file: \"$params(-input)\""
+        exit 1
+    }
+    if {[catch {Rappture::library $params(-input)} result] == 0} {
+        set inputobj $result
+    }
 }
 
@@ -143 +127 @@
     # run.xml files they are loading.
     set pseudotool ""
-    if {0 == [llength $loadobjs]} {
+    if {[llength $loadobjs] == 0 && $inputobj eq ""} {
         puts stderr "can't find tool \"$params(-tool)\""
         exit 1
@@ -151 +135 @@
     # if there are loaders or notes, they will still need
     # examples/ and docs/ dirs from the install location
-    foreach runobj $loadobjs {
+    set check [concat $loadobjs $inputobj]
+    foreach runobj $check {
         set tdir \
             [string trim [$runobj get tool.version.application.directory(tool)]]
@@ -374 +359 @@
 
 # load previous xml runfiles
-if {0 != [llength $params(-load)]} {
+if {[llength $params(-load)] > 0} {
     foreach runobj $loadobjs {
-        # this doesn't seem to work with loaders
-        # loaders seem to get their value after this point
-        # may need to tell loader elements to update its value
-        $tool load $runobj
         $f.analyze load $runobj
     }
+    # load the inputs for the very last run
+    $tool load $runobj
+
     # don't need simulate button if we cannot simulate
     if {$params(-nosim)} {
@@ -388 +372 @@
     $f.analyze configure -notebookpage analyze
     $win.pager current analyzer
+} elseif {$params(-input) ne ""} {
+    $tool load $inputobj
+}
+
+# let components (loaders) settle after the newly loaded runs
+update
+
+foreach path [array names ::Rappture::parameters] {
+    set fname $::Rappture::parameters($path)
+    if {[catch {
+          set fid [open $fname r]
+          set info [read $fid]
+          close $fid}] == 0} {
+
+        set w [$tool widgetfor $path]
+        if {$w ne ""} {
+            if {[catch {$w value [string trim $info]} result]} {
+                puts stderr "WARNING: bad tool parameter value for \"$path\""
+                puts stderr "  $result"
+            }
+        } else {
+            puts stderr "WARNING: can't find control for tool parameter: $path"
+        }
+    }
 }