Changeset 6231

Timestamp:

Apr 1, 2016 10:28:56 AM (7 years ago)

Author:

gah

Message:

fix: code to _job(exitcode) in task.tcl, add -nosim configuration option to pager, use -nosim in analyzer to prevent automatically simulating when switching pages

Location:

branches/1.7

Files:

• gui/scripts/analyzer.tcl (modified) (2 diffs)
• gui/scripts/main.tcl (modified) (1 diff)
• gui/scripts/pager.tcl (modified) (2 diffs)
• lang/tcl/scripts/task.tcl (modified) (1 diff)

branches/1.7/gui/scripts/analyzer.tcl

@@ -451 +451 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Analyzer::simulate {args} {
-    #puts "simulate args='$args'"
 
     set uq [$_tool get_uq -uq_type smolyak -uq_args 2]
@@ -1957 +1956 @@
     configure -notebookpage analyze
     global win
+    $win.pager configure -nosim 1 
     $win.pager current analyzer
+    $win.pager configure -nosim 0 
    if 0 {
     # Load the inputs for the very last run

branches/1.7/gui/scripts/main.tcl

@@ -405 +405 @@
 
 foreach path [array names ::Rappture::parameters] {
+    if { $path == "simset" } {
+        continue;                       # Don't consider file(simset)
+    }
     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"
-        }
+    if { ![file exists $fname] } {
+        puts stderr "WARNING: tool parameters file \"$fname\" doesn't exist"
+        continue;                       # Can't find parameters file
+    }        
+    if { ![file readable $fname] } {
+        puts stderr "WARNING: can't read tool parameters file \"$fname\""
+        continue;                       # Can't read parameters file
+    }
+    set f [open $fname r]
+    set contents [read $f]
+    close $f
+    
+    set w [$tool widgetfor $path]
+    if { $w == "" } {
+        puts stderr "WARNING: can't find control for tool parameter: $path"
+        continue;                       # Can't find rappture control for path
+    }
+    if {[catch {$w value [string trim $info]} result]} {
+        puts stderr "WARNING: bad tool parameter value for \"$path\""
+        puts stderr "  $result"
     }
 }

branches/1.7/gui/scripts/pager.tcl

@@ -67 +67 @@
     private variable _page2info      ;# maps page name => -frame,-title,-command
     private variable _current ""     ;# page currently shown
+    public variable nosim 0
 }
 
@@ -374 +375 @@
             # invoke it now.
             #
-            if {"" != $_current
-                  && [string length $_page2info($_current-command)] > 0} {
+            if {"" != $_current && !$nosim && 
+                  [string length $_page2info($_current-command)] > 0} {
                 uplevel #0 $_page2info($_current-command)
             }

branches/1.7/lang/tcl/scripts/task.tcl

@@ -626 +626 @@
             # non-zero exitcode.  Consider this an invalid result from the
             # program.  Append the stderr from the program to the message.
-            if {$code > 128} {
+            if {$_job(exitcode) > 128} {
                 set logmesg "Program signaled: signal was [GetSignal $_job(exitcode)]"
             } else {