Changeset 6164 for branches/1.6

Timestamp:

Mar 21, 2016 7:15:07 AM (8 years ago)

Author:

gah

Message:

merge changes from 1.5 (remove tk_getSaveFile calls)

Location:

branches/1.6/gui/scripts

Files:

• analyzer.tcl (modified) (12 diffs)
• imageresult.tcl (modified) (1 diff)

branches/1.6/gui/scripts/analyzer.tcl

@@ -54 +54 @@
     private variable _saved 
     private variable _name "" 
+    private variable _revision 0;       # Tool revision
     
     constructor {tool args} {
@@ -120 +121 @@
     private method SelectSimsetNameAndSave {}
     private method SelectSimsetToPublish {}
-    private method WriteSimsetFile { appName fileName }
+    private method WriteSimsetFile { appName fileName publish }
+    private method OverwriteSaveFile {}
+    private method BuildQuestionDialog { popup }
+    private method Save {}
 }
 
@@ -176 +180 @@
     global rapptureInfo
     if { $rapptureInfo(appName) == "" } {
-        set _appName [$_tool xml get tool.id]
+        set _appName [$_tool xml get "tool.id"]
     } else {
         set _appName $rapptureInfo(appName)
     }
+    set num [$_tool xml get "tool.version.application.revision"]
+    if { $num == "" } {
+        set num 0
+    }
+    set _revision $num
     set url [Rappture::Tool::resources -huburl]
 
@@ -1661 +1670 @@
     blt::table configure $top r0 c0 -resize both
 }
+
+itcl::body Rappture::Analyzer::CleanName { name } {
+    regsub -all {/} $name {_} name
+    return $name
+}
+
 #
 # Get the results and display them in a table.
@@ -1670 +1685 @@
         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
-        }
+        set fileName [file join $appDir [CleanName $_saved(Name).sav]]
+        if { [file exists $fileName] } {
+            if { ![OverwriteSaveFile] } {
+                return
+            }
+        }
+        WriteSimsetFile $_appName $fileName 0
     }
 }
@@ -1691 +1706 @@
         if { [catch {
             file mkdir $shareDir
+            file attributes $shareDir -permissions o+r,g+rw
         } 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
-        }
+        set fileName [file join $shareDir [CleanName $_saved(Name).sav]]
+        if { [file exists $fileName] } {
+            if { ![OverwriteSaveFile] } {
+                return
+            }
+        }
+        WriteSimsetFile $_appName $fileName 1
     }
 }
@@ -1737 +1753 @@
     set desc [string trim [$inner.desc get 0.0 end]]
     set _saved(Application) $_appName
+    set _saved(Revision) $_revision
     set _saved(Date) [clock format [clock seconds]]
     set _saved(Name) $name
@@ -1785 +1802 @@
 #       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
+itcl::body Rappture::Analyzer::WriteSimsetFile { appName fileName publish } {
+    # 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] } {
@@ -1796 +1813 @@
         file mkdir $root
         set f [open $fileName "w"]
-        puts $f [list "Name" $_saved(Name)]
+        puts $f [list "Name"        $_saved(Name)]
         puts $f [list "Description" $_saved(Description)]
-        puts $f [list "Date" $_saved(Date)]
+        puts $f [list "Date"        $_saved(Date)]
         global env
-        puts $f [list "Creator" $env(USER)]
+        puts $f [list "Creator"     $env(USER)]
         puts $f [list "Application" $_saved(Application)]
+        puts $f [list "Revision"    $_saved(Revision)]
         set runfiles ""
         foreach file $_saved(Files) {
@@ -1807 +1825 @@
             set dest [file join $root $tail]
             file copy -force $file $dest
+            if { $publish } {
+                file attributes $dest -permissions o+r,g+rw
+            }
             lappend runfiles $tail
         }
         puts $f [list "Files" $runfiles]
         close $f
+        if { $publish } {
+            file attributes $fileName -permissions o+r,g+rw
+        }
     } errs] != 0 } {
-        puts stderr errs=$errs
+        global errorInfo
+        puts stderr "errs=$errs errorInfo=$errorInfo"
     }
 }
@@ -1960 +1985 @@
     foreach fileName [glob -nocomplain ~/data/saved/$appName/*.sav] {
         if { [ReadSimsetFile $fileName] } {
+            if { $_revision > 0 && $_revision != $_saved(Revision) } {
+                continue;               # Revision doesn't match.
+            }
             $_tree insert 0 -label $_saved(Name) -data [array get _saved] 
         }
@@ -2054 +2082 @@
 }
 
+itcl::body Rappture::Analyzer::BuildQuestionDialog { popup } {
+    toplevel $popup -background grey92 -bd 2 -relief raised
+    wm withdraw $popup
+    wm overrideredirect $popup true
+    set inner $popup
+    # Create the print dialog widget and add it to the the balloon popup.
+    label $popup.title -text " " \
+        -padx 10 -pady 10 \
+        -background grey92 
+    button $popup.yes -text "Yes" \
+        -highlightthickness 0 \
+        -bd 2  \
+        -command [itcl::code $this Save] 
+    button $popup.no -text "No" \
+        -highlightthickness 0 \
+        -bd 2 \
+        -command [itcl::code $this Cancel] 
+    blt::table $popup \
+        0,0 $popup.title -cspan 2  -fill x -pady 4 \
+        1,0 $popup.yes -width { 0 1i .6i } -pady 4 \
+        1,1 $popup.no -width { 0 1i .6i }  -pady 4 
+    blt::table configure $popup  r2 -height 0.125i
+}
+
+itcl::body Rappture::Analyzer::Save {} {
+    set _done 1
+}
+
+itcl::body Rappture::Analyzer::OverwriteSaveFile {} {
+    set popup .question
+    if { ![winfo exists $popup] } {
+        BuildQuestionDialog $popup 
+    }
+    set text "Simulation set \"$_saved(Name)\" already exists. Overwrite?"
+    $popup.title configure -text $text 
+    $popup.yes configure -text "Save" 
+    $popup.no configure -text "Cancel" 
+    set main [winfo toplevel $itk_component(help)]
+    set pw [winfo reqwidth $popup]
+    set ph [winfo reqheight $popup]
+    set sw [winfo reqwidth $main]
+    set sh [winfo reqheight $main]
+    set rootx [winfo rootx $main]
+    set rooty [winfo rooty $main]
+    set x [expr $rootx + (($sw - $pw) / 2)]
+    set y [expr $rooty + (($sh - $ph) / 2)]
+    wm geometry $popup +$x+$y
+    wm deiconify $popup 
+    update
+    grab $popup 
+    # Activate the popup and call for the output.
+    Cancel
+    tkwait variable [itcl::scope _done]
+    set doSave $_done
+    grab release $popup 
+    destroy $popup 
+    return $doSave
+}

branches/1.6/gui/scripts/imageresult.tcl

@@ -475 +475 @@
                 set w [winfo width $itk_component(image)]
                 set h [winfo height $itk_component(image)]
-                if {$w == 1 && $h == 1} {
+                if {$w <= 1 && $h <= 1} {
                     return 0
                 }