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

Timestamp:

Feb 19, 2006, 8:10:19 PM (19 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/imageresult.tcl (modified) (4 diffs)

trunk/gui/scripts/imageresult.tcl

@@ -14 +14 @@
 package require Itk
 package require BLT
+package require Img
 
 option add *ImageResult.width 3i widgetDefault
@@ -56 +57 @@
     public method delete {args}
     public method scale {args}
-    public method download {}
+    public method download {option}
 
     protected method _rebuild {args}
@@ -289 +290 @@
 
 # ----------------------------------------------------------------------
-# USAGE: download
+# USAGE: download coming
+# USAGE: download now
 #
 # Clients use this method to create a downloadable representation
@@ -296 +298 @@
 # "string" is the data itself.
 # ----------------------------------------------------------------------
-itcl::body Rappture::ImageResult::download {} {
-    set top [_topimage]
-    if {$top == ""} {
-        return ""
-    }
-    return [list jpg [image data $top -format jpg]]
+itcl::body Rappture::ImageResult::download {option} {
+    switch $option {
+        coming {
+            # nothing to do
+        }
+        now {
+            set top [_topimage]
+            if {$top == ""} {
+                return ""
+            }
+
+            #
+            # Hack alert!  Need data in binary format,
+            # so we'll save to a file and read it back.
+            #
+            set tmpfile /tmp/image[pid].jpg
+            $top write $tmpfile -format jpeg
+            set fid [open $tmpfile r]
+            fconfigure $fid -encoding binary -translation binary
+            set bytes [read $fid]
+            close $fid
+            file delete -force $tmpfile
+
+            return [list .jpg $bytes]
+        }
+        default {
+            error "bad option \"$option\": should be coming, now"
+        }
+    }
 }