Changeset 1809 for branches

Timestamp:

Jul 14, 2010, 4:16:48 PM (14 years ago)

Author:

gah

Message:

 

Location:

branches/blt4/gui/scripts

Files:

• imageresult.tcl (modified) (3 diffs)
• molvisviewer.tcl (modified) (3 diffs)

branches/blt4/gui/scripts/imageresult.tcl

@@ -355 +355 @@
         set iw [image width $imh]
         set ih [image height $imh]
-
-        if { $_scale(current) < 1.0 } {
+        set wz [expr {round($w*$_scale(current))}]
+        set hz [expr {round($h*$_scale(current))}]
+
+        if {$wz < $iw || $hz < $ih} {
             #
             # Scale the image up by creating a "zoom" image which
@@ -363 +365 @@
             # image, then scale that part up to the full "view" area.
             #
-            set wz [expr {round($w*$_scale(current))}]
-            set hz [expr {round($h*$_scale(current))}]
             if {$wz > $iw} {
                 set wz $iw
@@ -396 +396 @@
                 $_image(final) resample $_image(zoom) -filter sinc
             }
-        } elseif {$_scale(current) > 1.0} {
+        } else {
             #
             # Scale the image down by creating a "zoom" image which

branches/blt4/gui/scripts/molvisviewer.tcl

@@ -603 +603 @@
 #
 itcl::body Rappture::MolvisViewer::Connect {} {
+    set _waitForImage 0;                
     if { [isconnected] } {
         return 1
@@ -638 +639 @@
     set _state(client) 1
     set _outbuf ""
+    set _waitForImage 0
 }
 
@@ -1464 +1466 @@
         }
     }
-    update idletasks
-    update 
+    # In a sequence there will be multiple calls to the "add" method.  Run
+    # "update" here to let the fileevent handler catch up with images,
+    # regardless of the speed setting in the sequence.
+    update
 }