Changeset 1506 for trunk/gui/scripts/flowvisviewer.tcl

Timestamp:

Jun 10, 2009 2:40:56 PM (15 years ago)

Author:

gah

Message:

 

File:

• trunk/gui/scripts/flowvisviewer.tcl (modified) (19 diffs)

trunk/gui/scripts/flowvisviewer.tcl

@@ -111 +111 @@
     private method FlowCmd { dataobj comp nbytes extents }
     private method GetMovie { widget width height }
+    private method GetPngImage { widget width height }
     private method NameTransferFunc { dataobj comp }
     private method PanCamera {}
@@ -147 +148 @@
     private variable _first ""     ;# This is the topmost volume.
     private variable _buffering 0
+    private variable _nextToken 0
+    private variable _icon 0
     private variable _flow
     # This 
@@ -152 +155 @@
     # function to use when changing markers,
     # opacity, or thickness.
-    common _downloadPopup          ;# download options from popup
+    private common _downloadPopup          ;# download options from popup
 
     private common _hardcopy
@@ -200 +203 @@
     $_dispatcher register !goto
     $_dispatcher dispatch $this !goto "[itcl::code $this flow goto2]; list"
+
+    $_dispatcher register !movietimeout
+    $_dispatcher register !waiticon
 
     set _flow(state) 0
@@ -735 +741 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::FlowvisViewer::download {option args} {
+    set popup .flowvisviewerdownload
     switch $option {
         coming {
@@ -745 +752 @@
         }
         controls {
-            set popup .flowvisviewerdownload
-            if {![winfo exists .flowvisviewerdownload]} {
+            if {![winfo exists $popup]} {
                 # if we haven't created the popup yet, do it now
                 Rappture::Balloon $popup \
@@ -756 +762 @@
                 set res "[image width $img]x[image height $img]"
                 radiobutton $inner.draft -text "Image (draft $res)" \
-                    -variable Rappture::MolvisViewer::_downloadPopup(format) \
+                    -variable Rappture::FlowvisViewer::_downloadPopup(format) \
                     -value draft
                 pack $inner.draft -anchor w
@@ -762 +768 @@
                 set res "640x480"
                 radiobutton $inner.medium -text "Movie (standard $res)" \
-                    -variable Rappture::MolvisViewer::_downloadPopup(format) \
+                    -variable Rappture::FlowvisViewer::_downloadPopup(format) \
                     -value $res
                 pack $inner.medium -anchor w
@@ -768 +774 @@
                 set res "1024x768"
                 radiobutton $inner.high -text "Movie (high quality $res)" \
-                    -variable Rappture::MolvisViewer::_downloadPopup(format) \
+                    -variable Rappture::FlowvisViewer::_downloadPopup(format) \
                     -value $res
                 pack $inner.high -anchor w
@@ -780 +786 @@
             set num [llength [get]]
             set num [expr {($num == 1) ? "1 result" : "$num results"}]
-            $inner.summary configure -text "[Rappture::filexfer::label downloadWord] $num in the following format:"
+            set word [Rappture::filexfer::label downloadWord]
+            $inner.summary configure -text "$word $num in the following format:"
             update idletasks ;# fix initial sizes
             return $popup
         }
         now {
-            set popup .molvisviewerdownload
-            if {[winfo exists .molvisviewerdownload]} {
+            if { [winfo exists $popup] } {
                 $popup deactivate
             }
@@ -796 +802 @@
                     # won't be necessary to decode the image data.
                     set bytes [$_image(plot) data -format "jpeg -quality 100"]
-                    set data [Rappture::encoding::decode -as b64 $data]
-                    return [list .jpg $data]
+                    set bytes [Rappture::encoding::decode -as b64 $bytes]
+                    return [list .jpg $bytes]
                 }
                 "640x480" {
@@ -804 +810 @@
                 "1024x768" {
                     return [$this GetMovie [lindex $args 0] 1024 768]
+                }
+                default {
+                    error "bad download format $_downloadPopup(format)"
                 }
             }
@@ -1032 +1041 @@
     set bytes [ReceiveBytes $info(-bytes)]
     ReceiveEcho <<line "<read $info(-bytes) bytes"
-    if { $info(-type) == "image" } {
-        $_image(plot) configure -data $bytes
-        #puts stderr "image received [image width $_image(plot)] by [image height $_image(plot)]"
-    } elseif { $info(type) == "print" } {
-        set tag $this-print-$info(-token)
-        set _hardcopy($tag) $bytes
-    } elseif { $info(type) == "movie" } {
-        set tag $this-movie-$info(-token)
-        set _hardcopy($tag) $bytes
+    switch -- $info(-type)  {
+        "image" {
+            $_image(plot) configure -data $bytes
+            #puts stderr "image received [image width $_image(plot)] by [image height $_image(plot)]"
+        } 
+        "print" {
+            set tag $this-$info(-token)
+            set _hardcopy($tag) $bytes
+        } 
+        "movie" {
+            puts stderr "read [string length $bytes] bytes type=$info(-type) token=$info(-token)"
+            set tag $this-$info(-token)
+            set _hardcopy($tag) $bytes
+        }
+        default {
+            puts stderr "unknown download type $info(-type)"
+        }
     }
 }
@@ -2786 +2803 @@
 }
 
-itcl::body Rappture::MolvisViewer::GetPngImage  { widget width height } {
+itcl::body Rappture::FlowvisViewer::GetPngImage  { widget width height } {
     set token "print[incr _nextToken]"
-    set var ::Rappture::MolvisViewer::_hardcopy($this-$token)
+    set var ::Rappture::FlowvisViewer::_hardcopy($this-$token)
     set $var ""
 
@@ -2794 +2811 @@
     $_dispatcher dispatch $this !pngtimeout "set $var {} ; list"
 
-    set popup .molvisviewerprint
+    set popup .flowvisviewerprint
     if {![winfo exists $popup]} {
         Rappture::Balloon $popup -title "Generating file..."
@@ -2845 +2862 @@
 itcl::body Rappture::FlowvisViewer::GetMovie { widget width height } {
     set token "movie[incr _nextToken]"
-    set var ::Rappture::MolvisViewer::_hardcopy($this-$token)
+    set var ::Rappture::FlowvisViewer::_hardcopy($this-$token)
     set $var ""
 
@@ -2870 +2887 @@
         set inner [$popup component inner]
     }
-    $_dispatcher event -after 60000 !movietimeout
+    $_dispatcher event -after 300000 !movietimeout
     WaitIcon start $inner.icon
     grab set -local $inner
@@ -2877 +2894 @@
     flow duration
     flow speed
-    set nframes [expr $_flow(duration) / $_flow(delay)]
+    set nframes [expr round($_flow(duration) / $_flow(delay))]
     set framerate [expr 1000.0 / $_flow(delay)]
-    set bitrate 2000
-
+    set framerate 25.0
+    set bitrate 400000
+
+    set start [clock seconds]
     SendCmd "flow video $width $height $nframes $framerate $bitrate $token"
     
@@ -2891 +2910 @@
     tkwait variable $var
 
+    puts stderr "I'm back in [expr [clock seconds] - $start] seconds."
     # Clean up.
-    $_dispatcher cancel !pngtimeout
+    $_dispatcher cancel !movietimeout
     WaitIcon stop $inner.icon
     grab release $inner