Changeset 5981

Timestamp:

Feb 9, 2016, 8:20:48 AM (9 years ago)

Author:

gah

Message:

add simsets, fix puq execution to not use use

Location:

branches/1.4

Files:

• configure (modified) (2 diffs)
• configure.in (modified) (1 diff)
• gui/apps/launcher.tcl (modified) (4 diffs)
• gui/scripts/analyzer.tcl (modified) (7 diffs)
• gui/scripts/images/hamburger_menu.png (added)
• gui/scripts/main.tcl (modified) (4 diffs)
• gui/scripts/responseviewer.tcl (modified) (1 diff)
• gui/scripts/resultset.tcl (modified) (1 diff)
• lang/tcl/scripts/task.tcl (modified) (5 diffs)
• puq/Makefile.in (modified) (2 diffs)
• puq/analyze.py (moved) (moved from branches/1.4/puq/puq_analyze.py)
• puq/puq.in (added)

branches/1.4/configure

@@ -10216 +10216 @@
 
 
-ac_config_files="$ac_config_files Makefile packages/Makefile src/Makefile src/core/Makefile src/core2/Makefile src/objects/Makefile src/objects/RpHash.h gui/Makefile gui/apps/Makefile gui/apps/about gui/apps/copy_rappture_examples gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile gui/src/Makefile builder/Makefile builder/pkgIndex.tcl builder/scripts/Makefile tester/Makefile tester/pkgIndex.tcl tester/scripts/Makefile lang/Makefile lang/java/Makefile lang/java/rappture/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/octave2/Makefile lang/octave/octave3/Makefile lang/R/Makefile lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/scripts/Makefile lang/tcl/src/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/java/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/octave2/Makefile examples/app-fermi/octave/octave3/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/perl/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/app-fermi/R/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/curve/Makefile examples/zoo/drawing/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/group/Makefile examples/zoo/histogram/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/log/Makefile examples/zoo/mesh/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/parallelepiped/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile video/Makefile video/pkgIndex.tcl oldtest/Makefile oldtest/src/Makefile puq/Makefile"
+ac_config_files="$ac_config_files Makefile packages/Makefile src/Makefile src/core/Makefile src/core2/Makefile src/objects/Makefile src/objects/RpHash.h gui/Makefile gui/apps/Makefile gui/apps/about gui/apps/copy_rappture_examples gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile gui/src/Makefile builder/Makefile builder/pkgIndex.tcl builder/scripts/Makefile tester/Makefile tester/pkgIndex.tcl tester/scripts/Makefile lang/Makefile lang/java/Makefile lang/java/rappture/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/octave2/Makefile lang/octave/octave3/Makefile lang/R/Makefile lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/scripts/Makefile lang/tcl/src/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/java/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/octave2/Makefile examples/app-fermi/octave/octave3/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/perl/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/app-fermi/R/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/curve/Makefile examples/zoo/drawing/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/group/Makefile examples/zoo/histogram/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/log/Makefile examples/zoo/mesh/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/parallelepiped/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile video/Makefile video/pkgIndex.tcl oldtest/Makefile oldtest/src/Makefile puq/Makefile puq/puq"
 
 cat >confcache <<\_ACEOF
@@ -11041 +11041 @@
     "oldtest/src/Makefile") CONFIG_FILES="$CONFIG_FILES oldtest/src/Makefile" ;;
     "puq/Makefile") CONFIG_FILES="$CONFIG_FILES puq/Makefile" ;;
+    "puq/puq") CONFIG_FILES="$CONFIG_FILES puq/puq" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

branches/1.4/configure.in

@@ -601 +601 @@
     oldtest/src/Makefile
     puq/Makefile
+    puq/puq
 ])
 AC_OUTPUT

branches/1.4/gui/apps/launcher.tcl

@@ -43 +43 @@
 set params(input) ""
 
+set _rapptureCwd [pwd]
+
 if {[info exists env(TOOL_PARAMETERS)]} {
     # if we can't find the file, wait a little
@@ -79 +81 @@
                             set params(opt) "-load"
                         }
+                        "(simset)" - "" {
+                            lappend params(simset) $value
+                            set params(opt) "-simset"
+                        }
                         "(execute)" {
                             set params(execute) $value
@@ -173 +179 @@
                     set argv [lrange $argv 1 end]
                 }
+            }
+            -simset {
+                lappend alist $opt [lindex $argv 0]
+                set argv [lrange $argv 1 end]
             }
             default {
@@ -194 +204 @@
             set loadlist [concat $loadlist $params(load)]
             set alist [concat $alist -load $loadlist]
+
+            package require RapptureGUI
+            set guidir $RapptureGUI::library
+            set mainscript [file join $guidir scripts main.tcl]
+            set reqpkgs Tk
+        }
+        -simset {
+            # add tool parameters to the end of any files given on cmd line
+            set loadlist [concat $loadlist $params(simset)]
+            set alist [concat $alist -simset $loadlist]
 
             package require RapptureGUI

branches/1.4/gui/scripts/analyzer.tcl

@@ -50 +50 @@
     itk_option define -notebookpage notebookPage NotebookPage ""
 
+    private variable _done 0
+    private variable _tree ""
+    private variable _saved 
+    private variable _name "" 
+    
     constructor {tool args} {
         # defined below
@@ -60 +65 @@
     public method reset {{when -eventually}}
     public method load {xmlobj}
+    public method reload { fileName }
     public method clear {{xmlobj "all"}}
     public method download {option args}
@@ -84 +90 @@
 
     private variable _tool ""          ;# belongs to this tool
-    private variable _appName ""       ;# Name of application
+    private variable _appName "test"   ;# Name of application
     private variable _control "manual" ;# start mode
     private variable _resultset ""     ;# ResultSet object with all results
@@ -97 +103 @@
     private variable _uq_active 0      ;# a UQ variables has been used
     private variable _wait_uq 0
+
+    private method BuildMenu { url }
+    private method BuildSimulationTable { w }
+    private method Cancel {}
+    private method CheckSimsetDetails {}
+    private method EditSimset {}
+    private method FindSimsetsForApp { appName }
+    private method GetSimset { name }
+    private method LoadSimulations { runfiles }
+    private method Ok {}
+    private method PostMenu {}
+    private method ReadSimsetFile { fileName }
+    private method SaveSimulations {}
+    private method SelectSimsetForDeletion {}
+    private method SelectSimsetForLoading {}
+    private method SelectSimsetNameAndSave {}
+    private method SelectSimsetToPublish {}
+    private method WriteSimsetFile { appName fileName }
 }
 
@@ -108 +132 @@
 itcl::body Rappture::Analyzer::constructor {tool args} {
     set _tool $tool
+    set _tree [blt::tree create]
 
     # use this to store all simulation results
@@ -150 +175 @@
     # if there's a hub url, then add "About" and "Questions" links
     set _appName [$_tool xml get tool.id]
+# For testing
+    if { $_appName == "" } {
+        set _appName "test"
+    }
     set url [Rappture::Tool::resources -huburl]
-    if {"" != $url && "" != $_appName} {
-        itk_component add hubcntls {
-            frame $itk_component(simbg).hubcntls
-        } {
-            usual
-            rename -background -simcontrolcolor simControlColor Color
-        }
-        pack $itk_component(hubcntls) -side right -padx 4
-
-        itk_component add icon {
-            label $itk_component(hubcntls).icon -image [Rappture::icon ask] \
-                -highlightthickness 0
-        } {
-            usual
-            ignore -highlightthickness
-            rename -background -simcontrolcolor simControlColor Color
-        }
-        pack $itk_component(icon) -side left
-
-        itk_component add about {
-            button $itk_component(hubcntls).about -text "About this tool" \
-                -command [list Rappture::filexfer::webpage \
-                              "$url/tools/$_appName"]
-        } {
-            usual
-            ignore -font
-            rename -background -simcontrolcolor simControlColor Color
-            rename -highlightbackground -simcontrolcolor simControlColor Color
-        }
-        pack $itk_component(about) -side top -anchor w
-
-        itk_component add questions {
-            button $itk_component(hubcntls).questions -text Questions? \
-                -command [list Rappture::filexfer::webpage \
-                              "$url/resources/$_appName/questions"]
-        } {
-            usual
-            ignore -font
-            rename -background -simcontrolcolor simControlColor Color
-            rename -highlightbackground -simcontrolcolor simControlColor Color
-        }
-        pack $itk_component(questions) -side top -anchor w
-    }
-
+
+    itk_component add hubcntls {
+        frame $itk_component(simbg).hubcntls
+    } {
+        usual
+        rename -background -simcontrolcolor simControlColor Color
+    }
+    pack $itk_component(hubcntls) -side right -padx 4
+    
+    itk_component add help {
+        menubutton $itk_component(hubcntls).help \
+            -image [Rappture::icon hamburger_menu] \
+            -highlightthickness 0 \
+            -menu $itk_component(hubcntls).help.menu
+    } {
+        usual
+        ignore -highlightthickness
+        rename -background -simcontrolcolor simControlColor Color
+    }
+    pack $itk_component(help) -side left
+    BuildMenu $url
+    
+    if 0 {
+    itk_component add about {
+        button $itk_component(hubcntls).about \
+            -text "About this tool" \
+            -command [list Rappture::filexfer::webpage \
+                          "$url/tools/$_appName"]
+    } {
+        usual
+        ignore -font
+        rename -background -simcontrolcolor simControlColor Color
+        rename -highlightbackground -simcontrolcolor simControlColor Color
+    }
+    pack $itk_component(about) -side top -anchor w
+    
+    itk_component add questions {
+        button $itk_component(hubcntls).questions -text Questions? \
+            -command [list Rappture::filexfer::webpage \
+                          "$url/resources/$_appName/questions"]
+    } {
+        usual
+        ignore -font
+        rename -background -simcontrolcolor simControlColor Color
+        rename -highlightbackground -simcontrolcolor simControlColor Color
+    }
+    pack $itk_component(questions) -side top -anchor w
+    if { $url == "" || $_appName == "" } {
+        $itk_component(questions) configure -state disabled
+        $itk_component(about) configure -state disabled
+    } else {
+        $itk_component(questions) configure -state normal
+        $itk_component(about) configure -state normal
+    }        
+    }
     itk_component add simstatus {
         text $itk_component(simbg).simstatus -borderwidth 0 \
@@ -1495 +1535 @@
     _fixNotebook
 }
+
+itcl::body Rappture::Analyzer::PostMenu {} {
+    set m $itk_component(help).menu 
+    if { [FindSimsetsForApp $_appName] == 0 } {
+        $m entryconfigure "Load Simulations" -state disable
+    } else {
+        $m entryconfigure "Load Simulations" -state normal
+    }
+    if { [$_resultset size] == 0 } {
+        $m entryconfigure "Delete Simulations" -state disabled
+        $m entryconfigure "Save Simulations" -state disabled
+    } else {
+        $m entryconfigure "Delete Simulations" -state normal
+        $m entryconfigure "Save Simulations" -state normal
+    }
+}
+        
+#
+# Build Help menu 
+#
+itcl::body Rappture::Analyzer::BuildMenu { url } {
+    set m $itk_component(help).menu 
+    itk_component add helpmenu {
+        menu $itk_component(help).menu \
+            -tearoff 0 \
+            -postcommand [itcl::code $this PostMenu]
+    } {
+        ignore -tearoff
+    }
+    if { $_appName == "" || $url == "" } {
+        set state disabled
+    } else {
+        set state normal
+    }
+        set state normal
+    $m add command -label "About this tool" \
+        -command [list Rappture::filexfer::webpage "$url/tools/$_appName"] \
+        -state $state
+    $m add command -label "Questions?" \
+        -command [list Rappture::filexfer::webpage \
+                      "$url/resources/$_appName/questions"] \
+        -state $state
+    $m add command -label "Wish List" -state $state 
+    $m add command -label "Tickets" -state $state
+    $m add separator
+    $m add command -label "Save Simulations" \
+        -command [itcl::code $this SelectSimsetNameAndSave] \
+        -state $state
+    $m add command -label "Load Simulations" \
+        -command [itcl::code $this SelectSimsetForLoading] \
+        -state $state
+    $m add command -label "Delete Simulations" \
+        -command [itcl::code $this SelectSimsetForDeletion] \
+        -state $state
+    $m add command -label "Publish Simulations" \
+        -command [itcl::code $this SelectSimsetToPublish] \
+        -state $state
+    return $m
+}
+
+itcl::body Rappture::Analyzer::BuildSimulationTable { top } {
+    # All weirdness is due to the Resultset object.
+
+    # First create nodes for each simulation.  The node label is the
+    # simulation number (such as #1, #2, etc).  
+    eval $_tree delete 0
+    set labels "selected simnum"
+    foreach {name index} [$_resultset diff values simnum] {
+        set node [$_tree insert 0 -label $name]
+        $_tree set $node "simnum" $name
+        set index2name($index) $name
+        
+    }
+    # Next fill in the xmlobj associated with each simulation.  We assume
+    # that the order is the the same as the simulation number.
+    set index 0
+    foreach {xmlobj dummy} [$_resultset diff values xmlobj]  {
+        set node [$_tree findchild 0 $index2name($index)]
+        set runfile [$xmlobj get output.filename]
+        set version [$xmlobj get output.version]
+        $_tree set $node \
+            "selected" 1 "xmlobj" $xmlobj "runfile" $runfile "version" $version
+        incr index
+    }
+    # Finally for each different input, for each simulation add the
+    # label and value for the specific input.
+    foreach name [$_resultset diff names] {
+        # Ignore non-input names.
+        if { $name == "xmlobj" || $name == "simnum" } {
+            continue
+        }
+        foreach node [$_tree children 0] {
+            set xmlobj [$_tree get $node xmlobj]
+            set label [$xmlobj get $name.about.label]
+            set value [$xmlobj get $name.current]
+            if { [$_tree exists $node $label] } {
+                puts stderr "This can't be: $label already exists in $node"
+            }
+            if { [lsearch $labels $label] < 0 } {
+                lappend labels $label
+            }
+            $_tree set $node $label $value
+        }
+    }
+    frame $top
+    set tv $top.tv
+    blt::treeview $top.tv -tree $_tree \
+        -height 1i \
+        -xscrollcommand [list $top.xs set] \
+        -yscrollcommand [list $top.ys set] \
+        -font "Arial 10"
+    scrollbar $top.xs -orient horizontal -command "$tv xview"
+    scrollbar $top.ys -orient vertical -command "$tv yview"
+        
+    eval $tv column insert end $labels
+    $tv style checkbox checkbox -showvalue no 
+    $tv column configure simnum -title "Simulation" 
+    $tv column configure selected -title "Save" -style checkbox \
+        -width .5i -edit yes 
+    $tv column configure treeView -hide yes 
+    blt::table $top \
+        0,0 $top.tv -fill both \
+        0,1 $top.ys -fill y \
+        1,0 $top.xs -fill x
+    blt::table configure $top r* c* -resize none
+    blt::table configure $top r0 c0 -resize both
+}
+#
+# Get the results and display them in a table.
+#
+# Use the table to omit specific results
+# Use file chooser to save to specific 
+itcl::body Rappture::Analyzer::SelectSimsetNameAndSave {} {
+    if { [EditSimset] } {
+        set appDir [file normalize ~/data/saved/$_appName]
+        file mkdir $appDir 
+        set fileName [tk_getSaveFile \
+                          -initialdir $appDir \
+                          -filetypes {{ "Simulations Save File" ".sav" }} \
+                          -title "Save Simulations To File"]
+        if { $fileName != "" } {
+            WriteSimsetFile $_appName $fileName
+        }
+    }
+}
+
+#
+# Get the results and display them in a table.
+#
+# Use the table to omit specific results
+# Use file chooser to save to specific 
+itcl::body Rappture::Analyzer::SelectSimsetToPublish {} {
+    if { [GetSimset "publish"] } {
+        global env
+        set shareDir [file join /data/tools/shared $_appName $env(USER)]
+        if { [catch {
+            file mkdir $shareDir
+        } errs != 0 } {
+            puts stderr errs=$errs
+            return 
+        }
+        set fileName [tk_getSaveFile \
+                          -initialdir $shareDir \
+                          -filetypes {{ "Simulations Set File" ".sav" }} \
+                          -title "Save Simulations To File"]
+        if { $fileName != "" } {
+            WriteSimsetFile $_appName $fileName
+        }
+    }
+}
+
+#
+# Checks editor widgets to see if the name and description have been
+# set.  If this is so it enables the save button in the editor.
+#
+itcl::body Rappture::Analyzer::CheckSimsetDetails {} {
+    set popup .savesimset
+    if { ![winfo exists $popup] } {
+        return
+    }
+    set inner [$popup component inner]
+    set name [string trim [$inner.name get]]
+    set desc [string trim [$inner.desc get 0.0 end]]
+    $inner.controls.save configure -state disabled
+    if { $name == "" || $desc == "" } {
+        return
+    }
+    $inner.controls.save configure -state normal
+}
+
+#
+# Gathers all the information from the simset editor into the _saved array
+#
+itcl::body Rappture::Analyzer::SaveSimulations {} {
+    set popup .savesimset
+    if { ![winfo exists $popup] } {
+        return
+    }
+    set inner [$popup component inner]
+    array unset _saved
+    set name [string trim [$inner.name get]]
+    set desc [string trim [$inner.desc get 0.0 end]]
+    set _saved(Application) $_appName
+    set _saved(Application) "test"
+    set _saved(Date) [clock format [clock seconds]]
+    set _saved(Name) $name
+    set _saved(Description) $desc
+    set files {}
+    foreach node [$_tree children root] {
+        set fileName [$_tree get $node runfile]
+        lappend files $fileName
+    }
+    set _saved(Files) $files
+    set _done 1 
+}
+
+itcl::body Rappture::Analyzer::Cancel {} {
+    set _done 0
+}
+
+itcl::body Rappture::Analyzer::Ok {} {
+    set popup .selectsimset
+    if { ![winfo exists $popup] } {
+        return
+    }
+    set inner [$popup component inner]
+    set tv $inner.tv
+    if { ![$tv selection present] } {
+        return
+    }
+    set node [$tv curselection]
+    array unset _saved
+    array set _saved [$_tree get $node]
+    set _done 1 
+}
+
+#
+# WriteSimsetFile --
+#
+#       Write the .sav file and the runfiles in the ~/data/saved/$_appName
+#       directory.  The subdirectory where the runfiles are written is
+#       the root of the .save file name.
+#
+itcl::body Rappture::Analyzer::WriteSimsetFile { appName fileName } {
+    # The runfiles directory is the root of the filename.
+    # For example, if the simset file is /path/to/myName.sav,
+    # the runfile directory is /path/to/myName
+    set root [file root $fileName]
+    if { [file exists $root] } {
+        file delete -force $root
+    }
+    if { [catch {
+        file mkdir $root
+        set f [open $fileName "w"]
+        puts $f [list "Name" $_saved(Name)]
+        puts $f [list "Description" $_saved(Description)]
+        puts $f [list "Date" $_saved(Date)]
+        global env
+        puts $f [list "Creator" $env(USER)]
+        puts $f [list "Application" $_saved(Application)]
+        set runfiles ""
+        set root [file root $fileName]
+        foreach file $_saved(Files) {
+            set tail [file tail $file]
+            set dest [file join $root $file]
+            file copy -force $file $dest
+            lappend runfiles $tail
+        }
+        puts $f [list "Files" $runfiles]
+        close $f
+    } errs] != 0 } {
+        puts stderr errs=$errs
+    }
+}
+
+itcl::body Rappture::Analyzer::EditSimset {} {
+    set popup .savesimset
+    if { [winfo exists $popup] } {
+        destroy $popup
+    }
+    # Create a popup for the print dialog
+    Rappture::Balloon $popup -title "Save set of simulations..."
+    set inner [$popup component inner]
+    
+    label $inner.name_l -text "Simulation Set Name"
+    entry $inner.name -background white
+    label $inner.desc_l -text "Simulation Set Description" -height 5 
+    text $inner.desc  -background white
+    label $inner.select_l -text "Selected Simulations"
+    BuildSimulationTable $inner.select
+    frame $inner.controls
+    bind $inner.desc <KeyPress> [itcl::code $this CheckSimsetDetails]
+    bind $inner.name <KeyPress> [itcl::code $this CheckSimsetDetails]
+    bind $inner.desc <Motion> [itcl::code $this CheckSimsetDetails]
+    bind $inner.name <Motion> [itcl::code $this CheckSimsetDetails]
+    button $inner.controls.cancel -text "Cancel" \
+        -command [itcl::code $this Cancel]
+    button $inner.controls.save -text "Save" \
+        -command [itcl::code $this SaveSimulations]
+    blt::table $inner.controls \
+        0,0 $inner.controls.cancel \
+        0,1 $inner.controls.save
+    
+    blt::table $inner \
+        0,0 $inner.name_l -anchor ne \
+        0,1 $inner.name -fill x \
+        1,0 $inner.desc_l -anchor ne \
+        1,1 $inner.desc -fill both \
+        2,0 $inner.select_l -anchor ne \
+        2,1 $inner.select -fill both \
+        3,1 $inner.controls  -fill x
+    blt::table configure $inner r1 -height 1i
+    blt::table configure $inner r2 -pad 20
+    $popup configure \
+        -deactivatecommand [itcl::code $this Cancel] 
+
+    set inner [$popup component inner]
+    if {[$_resultset size] > 1} {
+        blt::table $inner \
+            2,0 $inner.select_l -anchor ne \
+            2,1 $inner.select -fill both 
+    } else {
+        blt::table forget $inner.select $inner.select_l
+    }
+    CheckSimsetDetails
+    update
+    # Activate the popup and call for the output.
+    $popup activate $itk_component(help) below
+    Cancel
+    tkwait variable [itcl::scope _done]
+    set doSave $_done
+    $popup deactivate 
+    return $doSave
+}
+
+
+itcl::body Rappture::Analyzer::ReadSimsetFile { fileName } {
+    if { [catch {
+        set f [open $fileName "r"]
+        set contents [read $f]
+        close $f
+        array set _saved $contents
+    } errs] != 0 } {
+        return 0
+    }
+    if { ![info exists _saved(Files)] } {
+        return 0
+    }
+    set root [file root $fileName]
+    foreach file $_saved(Files) {
+        if { [file pathtype $file] == "relative" } {
+            set file [file join $root $file]
+        }
+        if { ![file readable $file] } {
+            puts stderr "runfile $file isn't readable"
+            return 0
+        }
+    }
+    set _saved(FileName) $fileName
+    return 1
+}
+
+#
+# Run files can be either explicitly named with their absolute or
+# relative path.  If the path is relative it is assumed the parent
+# directory is relative to the simset file.
+#
+#   /my/path/to/myfile.sav 
+#   /my/path/to/myfile/runfiles...
+#
+itcl::body Rappture::Analyzer::LoadSimulations { files } {
+    set loadobjs {}
+    set root [file root $_saved(FileName)]
+    foreach runfile $files {
+        if { [file pathtype $runfile] == "relative" } {
+            set runfile [file join $root $runfile]
+        }
+        if { ![file exists $runfile] } {
+            puts stderr "can't find run: \"$runfile\""
+            continue
+        }
+        set status [catch {Rappture::library $runfile} result]
+        lappend loadobjs $result
+    }
+    clear
+    foreach runobj $loadobjs {
+        load $runobj
+    }
+    configure -notebookpage analyze
+    global win
+    $win.pager current analyzer
+   if 0 {
+    # Load the inputs for the very last run
+    global tool
+    $tool load $runobj
+}
+}
+
+#
+# Delete selected simulation set.
+#
+itcl::body Rappture::Analyzer::SelectSimsetForDeletion {} {
+    if { [FindSimsetsForApp $_appName] == 0 } {
+        return
+    }
+    if { [GetSimset "delete"] } {
+        set root [file root $_saved(FileName)]
+        file delete -force $root
+        file delete -force $_saved(FileName) 
+    }
+}
+
+#
+# Find all .sav files for an application and load them into the tree.
+#
+itcl::body Rappture::Analyzer::FindSimsetsForApp { appName } {
+    $_tree delete 0
+    foreach fileName [glob -nocomplain ~/data/saved/$appName/*.sav] {
+        if { [ReadSimsetFile $fileName] } {
+            $_tree insert 0 -label $_saved(Name) -data [array get _saved] 
+        }
+    }
+    return [$_tree degree 0]
+}
+
+#
+# Create dialog to select a simset from the currently available simsets.
+#
+itcl::body Rappture::Analyzer::GetSimset { name } {
+    set popup .selectsimset
+    if { [winfo exists $popup] } {
+        destroy $popup
+    }
+    # Create a popup for the print dialog
+    set title [string tolower $name]
+    Rappture::Balloon $popup -title "Select set of simulations to $title..."
+    set inner [$popup component inner]
+    
+    set tv $inner.tv
+    blt::treeview $inner.tv -tree $_tree \
+        -height 1i \
+        -width 5i \
+        -xscrollcommand [list $inner.xs set] \
+        -yscrollcommand [list $inner.ys set] \
+        -font "Arial 10"
+    scrollbar $inner.xs -orient horizontal -command "$tv xview"
+    scrollbar $inner.ys -orient vertical -command "$tv yview"
+    frame $inner.controls
+        
+    $tv column insert end "Name" "Description" "Date" "Creator"
+    $tv column configure treeView -hide yes 
+    blt::table $inner \
+        0,0 $inner.tv -fill both \
+        0,1 $inner.ys -fill y \
+        1,0 $inner.xs -fill x
+    blt::table configure $inner r* c* -resize none
+    blt::table configure $inner r0 c0 -resize both
+
+    button $inner.controls.cancel -text "Cancel" \
+        -command [itcl::code $this Cancel]
+    set title [string totitle $name]
+    button $inner.controls.save -text $title \
+        -command [itcl::code $this Ok]
+    blt::table $inner.controls \
+        0,0 $inner.controls.cancel \
+        0,1 $inner.controls.save
+    
+    blt::table $inner \
+        0,0 $inner.tv -fill both \
+        0,1 $inner.ys -fill y \
+        1,0 $inner.xs -fill x \
+        3,0 $inner.controls  -fill x -cspan 2
+    blt::table configure $inner r* c* -resize none
+    blt::table configure $inner r0 c0 -resize both
+    blt::table configure $inner r2 -height 0.1i
+    
+    $popup configure \
+        -deactivatecommand [itcl::code $this Cancel] 
+
+    $tv selection set [$_tree firstchild 0]
+    set inner [$popup component inner]
+    update
+    # Activate the popup and call for the output.
+    $popup activate $itk_component(help) below
+    Cancel
+    tkwait variable [itcl::scope _done]
+    set result $_done
+    $popup deactivate 
+    return $result
+}
+
+itcl::body Rappture::Analyzer::SelectSimsetForLoading {} {
+    if { [FindSimsetsForApp $_appName] == 0 } {
+        return
+    }
+    if { [GetSimset "load"] } {
+        LoadSimulations $_saved(Files)
+    }
+}
+
+itcl::body Rappture::Analyzer::reload { fileName } {
+    if { [catch {
+        ReadSimsetFile $fileName
+        if { [llength $_saved(Files)] > 0 } {
+            #StartSplashScreen
+            LoadSimulations $_saved(Files)
+            #HideSplashScreen
+        }
+    } errs] != 0 } {
+        puts stderr "can't load \"$fileName\": errs=$errs"
+    }
+}
+

branches/1.4/gui/scripts/main.tcl

@@ -94 +94 @@
     list  -load ""
     value -input ""
+    value -simset ""
     value -nosim 0
 }
@@ -264 +265 @@
 set app [string trim [$tool xml get tool.id]]
 set url [Rappture::Tool::resources -huburl]
+if 0 {
 if {"" != $url && "" != $app} {
     set f [$win.pager component breadcrumbarea]
@@ -281 +283 @@
     pack $f.hubcntls.questions -side top -anchor w
 }
+}
+
+set f [$win.pager component breadcrumbarea]
+frame $f.hubcntls
+pack $f.hubcntls -side right -padx 4
+label $f.hubcntls.icon -image [Rappture::icon ask] -highlightthickness 0
+pack $f.hubcntls.icon -side left
+button $f.hubcntls.about \
+    -text "About this tool" \
+    -state disabled \
+    -command "
+        [list Rappture::filexfer::webpage $url/tools/$app]
+        Rappture::Logger::log help about
+    "
+pack $f.hubcntls.about -side top -anchor w
+button $f.hubcntls.questions \
+    -text Questions? \
+    -state disabled \
+    -command "
+        [list Rappture::filexfer::webpage $url/resources/$app/questions]
+        Rappture::Logger::log help questions
+    "
+pack $f.hubcntls.questions -side top -anchor w
+if { $url != "" && $app != "" } {
+    $f.hubcntls.about configure -state normal
+    $f.hubcntls.about configure -state normal
+}
 
 #
@@ -399 +428 @@
     $f.analyze configure -notebookpage analyze
     $win.pager current analyzer
+} elseif {$params(-simset) ne ""} {
+    $f.analyze reload $params(-simset)
 } elseif {$params(-input) ne ""} {
     $tool load $inputobj

branches/1.4/gui/scripts/responseviewer.tcl

@@ -152 +152 @@
 
     set rs $_response
-    if {[catch {exec get_response.py $fname $rs $var1 $var2 $_label} res]} {
+    if {[catch {exec puq get_response $fname $rs $var1 $var2 $_label} res]} {
         set fp [open "response.err" r]
         set rdata [read $fp]

branches/1.4/gui/scripts/resultset.tcl

@@ -219 +219 @@
                     foreach {raw norm} \
                         [Rappture::LibraryObj::value $xo $col] break
-
                     if {![info exists unique($v)]} {
                         # keep only unique label strings

branches/1.4/lang/tcl/scripts/task.tcl

@@ -203 +203 @@
 
     # write out the driver.xml file for the tool
-    set file "driver[pid].xml"
+    global _rapptureCwd
+    set file [file join $_rapptureCwd "driver[pid].xml"]
     set status [catch {
         set fid [open $file w]
@@ -404 +405 @@
             # UQ. Collect data from all jobs and put it in one xml run file.
             file delete -force -- run_uq.xml
-            if {[catch {exec puq_analyze.py puq_[pid].hdf5} res]} {
+            if {[catch {exec puq analyze puq_[pid].hdf5} res]} {
                 set fp [open "uq_debug.err" r]
                 set rdata [read $fp]
@@ -559 +560 @@
                 set rdir $_resources(-resultdir)
             } else {
-                set rdir "."
+                global _rapptureCwd
+                set rdir $_rapptureCwd
             }
         } elseif {$resultdir ne ""} {
@@ -578 +580 @@
     $xmlobj put tool.version.rappture.version $::Rappture::version
     $xmlobj put tool.version.rappture.revision $::Rappture::build
-
+    $xmlobj put output.filename $filename
+    $xmlobj put output.version $Rappture::version
+    
     if {[info exists ::tcl_platform(user)]} {
         $xmlobj put output.user $::tcl_platform(user)
@@ -649 +653 @@
     set pid [pid]
     # puts "get_params.py $pid $varlist $uq_type $uq_args"
-    if {[catch {exec get_params.py $pid $varlist $uq_type $uq_args}]} {
+    if {[catch {exec puq get_params $pid $varlist $uq_type $uq_args}]} {
         set fp [open "uq_debug.err" r]
         set rdata [read $fp]

branches/1.4/puq/Makefile.in

@@ -16 +16 @@
 pkgincludedir   = $(includedir)/$(PKG_DIR)
 top_builddir    = .
+puq_libdir      = $(libdir)/puq
 
 MKDIR_P         = @MKDIR_P@
 INSTALL         = @INSTALL@
 
-SCRIPTS = $(srcdir)/get_params.py \
-        $(srcdir)/puq_analyze.py \
-        $(srcdir)/get_response.py
+SCRIPTS =       $(srcdir)/get_params.py \
+                $(srcdir)/analyze.py \
+                $(srcdir)/get_response.py
 
 .PHONY: all install clean distclean
@@ -29 +30 @@
 
 install: all
-        $(MKDIR_P) -m 0755 $(bindir)
+        $(MKDIR_P) -m 0755 $(puq_libdir)
         @for i in $(SCRIPTS); do \
             echo "Installing $$i" ; \
-            $(INSTALL) -m 0555 $$i $(bindir) ; \
+            $(INSTALL) -m 0444 $$i $(puq_libdir) ; \
         done
+        $(INSTALL) -m 0555 puq $(bindir) 
+
 
 clean: