Changeset 695 for trunk/gui/scripts

Timestamp:

May 3, 2007, 8:11:17 PM (17 years ago)

Author:

nkissebe

Message:

clean up recovery of lost server connection

File:

• trunk/gui/scripts/molvisviewer.tcl (modified) (16 diffs)

trunk/gui/scripts/molvisviewer.tcl

@@ -78 +78 @@
     private variable _mrepresentation "spheres"
     private variable _cacheimage ""
+        private variable _busy 0
 }
 
@@ -286 +287 @@
 itcl::body Rappture::MolvisViewer::destructor {} {
     #puts stderr "MolvisViewer::destructor()"
+    image delete $_image(plot)
         disconnect
 }
@@ -320 +322 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::MolvisViewer::connect {{hostlist ""}} {
+    #puts stderr "Rappture::MolvisViewer::connect($hostlist)"
+
     if { "" != $hostlist } { set _hostlist $hostlist }
 
     set hostlist $_hostlist
+    $_image(plot) blank
 
     if ([isconnected]) {
@@ -332 +337 @@
     }
 
-    blt::busy hold $itk_component(hull); 
+    blt::busy hold $itk_component(hull) -cursor watch
     
     update idletasks
@@ -406 +411 @@
     catch { after cancel $_rocker(afterid) }
         catch { after cancel $_mevent(afterid) }
-    image delete $_image(plot)
 
     catch {
@@ -449 +453 @@
             set w [winfo width $itk_component(3dview)]
             set h [winfo height $itk_component(3dview)]
-            puts $_sid "screen -push $w $h"
+            puts $_sid "screen -defer $w $h"
             flush $_sid
             $_dispatcher event -idle !rebuild
@@ -513 +517 @@
             $_image(plot) put $_imagecache($tag)
             set _image(id) $tag
-            $itk_component(3dview) configure -cursor ""
+                        if { $_busy } {
+                $itk_component(3dview) configure -cursor ""
+                                set _busy 0
+                        }
             update idletasks
             break
@@ -542 +549 @@
         set _inrebuild 1
         set changed 0
+        set _busy 1
+
+    $itk_component(3dview) configure -cursor watch
 
         # refresh GUI (primarily to make pending cursor changes visible)
@@ -635 +645 @@
                         _send enable -defer $obj
                     if { $_labels } {
-                                _send label on
+                                _send label -defer on
                         } else {
-                                _send label off
+                                _send label -defer off
                         }
                 set changed 1
@@ -680 +690 @@
     } else {
                 set _state(client) $state
-        $itk_component(3dview) configure -cursor ""
                 _update
         }
@@ -715 +724 @@
     #puts stderr "Rappture::MolvisViewer::_configure($w $h)"
 
-        _send screen -push $w $h
     $_image(plot) configure -width $w -height $h
+        _send screen $w $h
 }
 
@@ -850 +859 @@
     }
 
+        if { ![info exists _mevent(x)] } {
+                set option "click"
+        }
+
     if { $option == "click" } { 
         $itk_component(3dview) configure -cursor fleur
@@ -855 +868 @@
 
     if { $option == "drag" || $option == "release" } {
-        set diff [expr $now - $_mevent(time) ]
+            set diff 0
+        catch { set diff [expr $now - $_mevent(time) ] }
 
         if {$diff < 75 && $option == "drag" } { # 75ms between motion updates
@@ -917 +931 @@
 itcl::body Rappture::MolvisViewer::_serverDown {} {
     #puts stderr "MolvisViewer::_serverDown()"
+
     set x [expr {[winfo rootx $itk_component(area)]+10}]
     set y [expr {[winfo rooty $itk_component(area)]+10}]
-    # this would automatically switch to vtk viewer:
-    # set parent [winfo parent $itk_component(hull)]
-    # $parent viewer vtk
+
     Rappture::Tooltip::cue @$x,$y "Lost connection to visualization server.  This happens sometimes when there are too many users and the system runs out of memory.\n\nTo reconnect, reset the view or press any other control.  Your picture should come right back up."
 }
@@ -1081 +1094 @@
                 set _dobj2raise($dataobj) $params(-raise)
 
-        $itk_component(3dview) configure -cursor watch
         $_dispatcher event -idle !rebuild
     }
@@ -1139 +1151 @@
         # if anything changed, then rebuild the plot
         if {$changed} {
-        $itk_component(3dview) configure -cursor watch
         $_dispatcher event -idle !rebuild
         }