Changeset 193 for trunk/gui/scripts/analyzer.tcl

Timestamp:

Feb 19, 2006, 8:10:19 PM (18 years ago)

Author:

mmc

Message:

• Added "Upload..." capability to the <loader> widget. You can now add an <upload> directive containing the path of the control that will receive data. A file is uploaded from the desktop and saved in the specified control.

• Fixed download capability to work properly for all result types, including contour plots and molecules.

• Added rappture::signal so we can catch SIGHUP and clean up the upload/download spool directory.

File:

• trunk/gui/scripts/analyzer.tcl (modified) (4 diffs)

trunk/gui/scripts/analyzer.tcl

@@ -54 +54 @@
     public method load {file}
     public method clear {}
-    public method download {}
+    public method download {option}
 
     protected method _plot {args}
@@ -198 +198 @@
         itk_component add download {
             button $w.top.dl -text "Download..." -anchor w \
-                -command [itcl::code $this download]
+                -command [itcl::code $this download now]
         }
         pack $itk_component(download) -side right -padx {4 0}
@@ -204 +204 @@
 
 NOTE:  Your web browser must allow pop-ups from this site.  If your output does not appear, look for a 'pop-up blocked' message and enable pop-ups."
+
+        bind $itk_component(download) <Enter> \
+            [itcl::code $this download coming]
     }
 
@@ -521 +524 @@
 
 # ----------------------------------------------------------------------
-# USAGE: download
+# USAGE: download coming
+# USAGE: download now
 #
 # Spools the current result so the user can download it.
 # ----------------------------------------------------------------------
-itcl::body Rappture::Analyzer::download {} {
+itcl::body Rappture::Analyzer::download {option} {
     if {[Rappture::filexfer::enabled]} {
         set title [$itk_component(resultselector) value]
         set page [$itk_component(resultselector) translate $title]
-        if {$page != ""} {
-            set ext ""
-            set f [$itk_component(resultpages) page $page]
-            foreach {ext data} [$f.rviewer download] break
-            if {"" == $ext} {
-                Rappture::Tooltip::cue $itk_component(download) \
-                    "Can't download this result."
-                return
-            }
-            regsub -all {[\ -\/\:-\@\{-\~]} $title {} title
-            set file "$title$ext"
-        } else {
-            # this shouldn't happen
-            set file error.html
-            set data "<h1>Not Found</h1>There is no result selected."
-        }
-
-        if {[catch {Rappture::filexfer::spool $data $file} result]} {
-            if {"no clients" == $result} {
-                Rappture::Tooltip::cue $itk_component(download) \
-                    "Can't download this result.  Looks like you might be having trouble with the version of Java installed for your browser."
-            } else {
-                error $result "    (while spooling result \"$title\")"
+
+        switch -- $option {
+            coming {
+                #
+                # Warn result that a download is coming, in case
+                # it needs to take a screen snap.
+                #
+                if {$page != ""} {
+                    set f [$itk_component(resultpages) page $page]
+                    $f.rviewer download coming
+                }
+            }
+            now {
+                #
+                # Perform the actual download.
+                #
+                if {$page != ""} {
+                    set ext ""
+                    set f [$itk_component(resultpages) page $page]
+                    foreach {ext data} [$f.rviewer download now] break
+                    if {"" == $ext} {
+                        Rappture::Tooltip::cue $itk_component(download) \
+                            "Can't download this result."
+                        return
+                    }
+                    regsub -all {[\ -\/\:-\@\{-\~]} $title {} title
+                    set file "$title$ext"
+                } else {
+                    # this shouldn't happen
+                    set file error.html
+                    set data "<h1>Not Found</h1>There is no result selected."
+                }
+
+                if {[catch {Rappture::filexfer::spool $data $file} result]} {
+                    if {"no clients" == $result} {
+                        Rappture::Tooltip::cue $itk_component(download) \
+                            "Can't download this result.  Looks like you might be having trouble with the version of Java installed for your browser."
+                    } else {
+                        error $result "    (while spooling result \"$title\")"
+                    }
+                }
+            }
+            default {
+                error "bad option \"$option\": should be coming, now"
             }
         }