Changeset 1839 for trunk/gui/scripts/sequenceresult.tcl

Timestamp:

Jul 20, 2010, 4:14:35 PM (14 years ago)

Author:

gah

Message:

removed -tkwait flag to molvisviewer addmethod

File:

• trunk/gui/scripts/sequenceresult.tcl (modified) (5 diffs)

trunk/gui/scripts/sequenceresult.tcl

@@ -200 +200 @@
         -description ""
         -param ""
-        -tkwait no
     }
     foreach {opt val} $settings {
@@ -355 +354 @@
         -command [itcl::code $this pause]
 
+    global readyForNextFrame 
+    set readyForNextFrame 1;            # By default, always ready
     # schedule the first frame
     set delay [expr {int(ceil(pow($_play(speed)/10.0+2,2.0)*15))}]
@@ -371 +372 @@
         set _afterId ""
     }
+    global readyForNextFrame 
+    set readyForNextFrame 1;            # By default, always ready
 
     # toggle the button to "play" mode
@@ -527 +530 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::SequenceResult::_playFrame {} {
-    set _pos [expr {$_pos+1}]
-    set last [expr {[llength $_indices]-1}]
-
-    if {$_pos > $last} {
-        if {$_play(loop)} {
-            set _pos 0
-        } else {
-            set _pos $last
-            pause
-            return
-        }
-    }
-    goto $_pos
-
-    set delay [expr {int(ceil(pow($_play(speed)/10.0+2,2.0)*15))}]
+    global readyForNextFrame 
+    if { $readyForNextFrame } {
+        set _pos [expr {$_pos+1}]
+        set last [expr {[llength $_indices]-1}]
+        
+        if {$_pos > $last} {
+            if {$_play(loop)} {
+                set _pos 0
+            } else {
+                set _pos $last
+                pause
+                return
+            }
+        }
+        goto $_pos
+        set delay [expr {int(ceil(pow($_play(speed)/10.0+2,2.0)*15))}]
+    } else {
+        set delay 50;                   # Poll for completion
+    }
     set _afterId [after $delay [itcl::code $this _playFrame]]
 }
@@ -568 +575 @@
     $itk_component(eleLabel) configure -text "[$_topmost label $_pos]"
     foreach dataobj [$_topmost value $_pos] {
-        set settings "-color autoreset -width 2 -tkwait yes"
+        set settings "-color autoreset -width 2"
         if {[catch {$dataobj hints style} style] == 0} {
             eval lappend settings $style