Changeset 50 for trunk/gui

Timestamp:

Aug 28, 2005, 9:09:01 PM (19 years ago)

Author:

mmc

Message:

Added support for file transfer with the desktop. Each Rappture
application acts like an http server, configured to listen on
a particular port according to the parameters found in the file
~/data/sessions/$SESSION/resources. When the server is active,
the GUI has a "Download..." button in the results area. A Java
client (in the filexfer directory) connects to the server and
listens for download requests. When the user clicks on "Download...",
the desired result is spooled to a file, and a Java client pops up
a web page requesting the file. This downloads the result to the
user's desktop.

Note that if the $SESSION environment variable is not set, these
changes do nothing.

Location:

trunk/gui

Files:

• apps/driver (modified) (1 diff)
• filexfer (added)
• filexfer/MANIFEST.MF (added)
• filexfer/Makefile (added)
• filexfer/favicon.ico (added)
• filexfer/filexfer.java (added)
• filexfer/middleman.tcl (added)
• filexfer/monitor.java (added)
• scripts/analyzer.tcl (modified) (4 diffs)
• scripts/contourresult.tcl (modified) (2 diffs)
• scripts/deviceresult.tcl (modified) (2 diffs)
• scripts/filexfer.tcl (added)
• scripts/getopts.tcl (modified) (1 diff)
• scripts/loader.tcl (modified) (3 diffs)
• scripts/meshresult.tcl (modified) (2 diffs)
• scripts/resultviewer.tcl (modified) (2 diffs)
• scripts/textresult.tcl (modified) (2 diffs)
• scripts/valueresult.tcl (modified) (2 diffs)
• scripts/xyresult.tcl (modified) (3 diffs)

trunk/gui/apps/driver

@@ -75 +75 @@
 
 set tool [Rappture::Tool ::#auto $xmlobj $installdir]
+
+# ----------------------------------------------------------------------
+# INITIALIZE THE DESKTOP CONNECTION
+#
+# If there's a SESSION ID, then this must be running within the
+# nanoHUB.  Try to initialize the server handling the desktop
+# connection.
+# ----------------------------------------------------------------------
+Rappture::filexfer::init
 
 # ----------------------------------------------------------------------

trunk/gui/scripts/analyzer.tcl

@@ -49 +49 @@
     public method load {file}
     public method clear {}
+    public method download {}
 
     protected method _plot {args}
@@ -191 +192 @@
     bind $itk_component(resultselector) <<Value>> [itcl::code $this _fixResult]
 
+    if {[Rappture::filexfer::enabled]} {
+        itk_component add download {
+            button $w.top.dl -text "Download..." \
+                -command [itcl::code $this download]
+        }
+        pack $itk_component(download) -side right -padx {4 0}
+        Rappture::Tooltip::for $itk_component(download) "Downloads the current result to a new web browser window on your desktop.  From there, you can easily print or save results."
+    }
+
     itk_component add results {
         Rappture::Panes $w.pane
@@ -450 +460 @@
     }
 
-    # if there is only one result page, take down the selector
-    set w [$itk_component(notebook) page analyze]
-    if {[$itk_component(resultselector) choices size] <= 1} {
-        pack forget $w.top
-    } else {
-        pack $w.top -before $itk_component(results) -side top -fill x
-    }
-
     # show the first page by default
     set first [$itk_component(resultselector) choices get -label 0]
@@ -502 +504 @@
     _fixSimControl
     reset
+}
+
+# ----------------------------------------------------------------------
+# USAGE: download
+#
+# Spools the current result so the user can download it.
+# ----------------------------------------------------------------------
+itcl::body Rappture::Analyzer::download {} {
+    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\")"
+            }
+        }
+    }
 }
 

trunk/gui/scripts/contourresult.tcl

@@ -84 +84 @@
     public method delete {args}
     public method scale {args}
+    public method download {}
 
     protected method _rebuild {}
@@ -403 +404 @@
 
 # ----------------------------------------------------------------------
+# USAGE: download
+#
+# Clients use this method to create a downloadable representation
+# of the plot.  Returns a list of the form {ext string}, where
+# "ext" is the file extension (indicating the type of data) and
+# "string" is the data itself.
+# ----------------------------------------------------------------------
+itcl::body Rappture::ContourResult::download {} {
+    return ""
+}
+
+# ----------------------------------------------------------------------
 # USAGE: _rebuild
 #

trunk/gui/scripts/deviceresult.tcl

@@ -26 +26 @@
     public method delete {args}
     public method scale {args}
+    public method download {}
 
     set _dataobj ""  ;# data object currently being displayed
@@ -111 +112 @@
     # nothing to do for structures
 }
+
+# ----------------------------------------------------------------------
+# USAGE: download
+#
+# Clients use this method to create a downloadable representation
+# of the plot.  Returns a list of the form {ext string}, where
+# "ext" is the file extension (indicating the type of data) and
+# "string" is the data itself.
+# ----------------------------------------------------------------------
+itcl::body Rappture::DeviceResult::download {} {
+    return ""
+}

trunk/gui/scripts/getopts.tcl

@@ -97 +97 @@
         }
         if {![info exists params($first)]} {
-            error "bad option \"$first\": should be [join [lsort $opts]] {, }]"
+            error "bad option \"$first\": should be [join [lsort $opts] {, }]"
         }
         switch -- [lindex $flags($first) 0] {

trunk/gui/scripts/loader.tcl

@@ -86 +86 @@
     foreach ftail $flist {
         set fpath [file join $fdir examples $ftail]
-        foreach fname [lsort [glob -nocomplain $fpath]] {
+
+        catch {unset entries}
+        foreach fname [glob -nocomplain $fpath] {
             if {[file exists $fname]} {
                 if {[catch {set obj [Rappture::library $fname]} result]} {
@@ -98 +100 @@
 
                     # if this is new, add it
-                    set i [$itk_component(combo) choices index -label $label]
-                    if {$i < 0} {
-                        $itk_component(combo) choices insert end $obj $label
-
-                        if {[string equal $defval [file tail $fname]]} {
-                            $_owner xml put $path.default $label
-                        }
+                    if {![info exists entries($label)]} {
+                        set entries($label) $obj
+                    }
+
+                    # translate default file name => default label
+                    if {[string equal $defval [file tail $fname]]} {
+                        $_owner xml put $path.default $label
                     }
                 }
@@ -110 +112 @@
                 puts stderr "WARNING: missing example file \"$fname\""
             }
+        }
+
+        foreach label [lsort -dictionary [array names entries]] {
+            $itk_component(combo) choices insert end $entries($label) $label
         }
     }

trunk/gui/scripts/meshresult.tcl

@@ -42 +42 @@
     public method delete {args}
     public method scale {args}
+    public method download {}
 
     protected method _rebuild {}
@@ -260 +261 @@
 
 # ----------------------------------------------------------------------
+# USAGE: download
+#
+# Clients use this method to create a downloadable representation
+# of the plot.  Returns a list of the form {ext string}, where
+# "ext" is the file extension (indicating the type of data) and
+# "string" is the data itself.
+# ----------------------------------------------------------------------
+itcl::body Rappture::MeshResult::download {} {
+    set psdata [$itk_component(plot) postscript output -maxpect 1]
+
+    set cmds {
+        set fout "mesh[pid].pdf"
+        exec ps2pdf - $fout << $psdata
+
+        set fid [open $fout r]
+        fconfigure $fid -translation binary -encoding binary
+        set pdfdata [read $fid]
+        close $fid
+
+        file delete -force $fout
+    }
+    if {[catch $cmds result] == 0} {
+        return [list .pdf $pdfdata]
+    }
+    return [list .ps $psdata]
+}
+
+# ----------------------------------------------------------------------
 # USAGE: _rebuild
 #

trunk/gui/scripts/resultviewer.tcl

@@ -30 +30 @@
 
     public method plot {option args}
+    public method download {}
 
     protected method _plotAdd {xmlobj {settings ""}}
@@ -319 +320 @@
 
 # ----------------------------------------------------------------------
+# USAGE: download
+#
+# Clients use this method to create a downloadable representation
+# of the plot.  Returns a list of the form {ext string}, where
+# "ext" is the file extension (indicating the type of data) and
+# "string" is the data itself.
+# ----------------------------------------------------------------------
+itcl::body Rappture::ResultViewer::download {} {
+    if {"" == $_mode} {
+        return ""
+    }
+    return [$_mode2widget($_mode) download]
+}
+
+# ----------------------------------------------------------------------
 # USAGE: _xml2data <xmlobj> <path>
 #

trunk/gui/scripts/textresult.tcl

@@ -29 +29 @@
     public method delete {args}
     public method scale {args}
+    public method download {}
 
     public method select {option args}
@@ -241 +242 @@
 
 # ----------------------------------------------------------------------
+# USAGE: download
+#
+# Clients use this method to create a downloadable representation
+# of the plot.  Returns a list of the form {ext string}, where
+# "ext" is the file extension (indicating the type of data) and
+# "string" is the data itself.
+# ----------------------------------------------------------------------
+itcl::body Rappture::TextResult::download {} {
+    return [list .txt [$itk_component(text) get 1.0 end]]
+}
+
+# ----------------------------------------------------------------------
 # USAGE: select all
 #

trunk/gui/scripts/valueresult.tcl

@@ -26 +26 @@
     public method delete {args}
     public method scale {args}
+    public method download {}
 
     set _dataobj ""  ;# data object currently being displayed
@@ -137 +138 @@
     # nothing to do for values
 }
+
+# ----------------------------------------------------------------------
+# USAGE: download
+#
+# Clients use this method to create a downloadable representation
+# of the plot.  Returns a list of the form {ext string}, where
+# "ext" is the file extension (indicating the type of data) and
+# "string" is the data itself.
+# ----------------------------------------------------------------------
+itcl::body Rappture::ValueResult::download {} {
+    return ""
+}

trunk/gui/scripts/xyresult.tcl

@@ -53 +53 @@
     public method delete {args}
     public method scale {args}
+    public method download {}
 
     protected method _rebuild {}
@@ -352 +353 @@
 
 # ----------------------------------------------------------------------
+# USAGE: download
+#
+# Clients use this method to create a downloadable representation
+# of the plot.  Returns a list of the form {ext string}, where
+# "ext" is the file extension (indicating the type of data) and
+# "string" is the data itself.
+# ----------------------------------------------------------------------
+itcl::body Rappture::XyResult::download {} {
+    set psdata [$itk_component(plot) postscript output -maxpect 1]
+
+    set cmds {
+        set fout "xy[pid].pdf"
+        exec ps2pdf - $fout << $psdata
+
+        set fid [open $fout r]
+        fconfigure $fid -translation binary -encoding binary
+        set pdfdata [read $fid]
+        close $fid
+
+        file delete -force $fout
+    }
+    if {[catch $cmds result] == 0} {
+        return [list .pdf $pdfdata]
+    }
+    return [list .ps $psdata]
+}
+
+# ----------------------------------------------------------------------
 # USAGE: _rebuild
 #
@@ -453 +482 @@
             }
             if {[info exists hints(yscale)] && $hints(yscale) == "log"} {
-                _axis scale x log
+                _axis scale y log
             }