Changeset 5356 for trunk

Timestamp:

Apr 29, 2015, 3:35:42 AM (9 years ago)

Author:

ldelgass

Message:

Make it easier to test virtual mouse events vs. client side event handling in
pymol viewer.

File:

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

trunk/gui/scripts/molvisviewer.tcl

@@ -70 +70 @@
     protected method Rebuild {}
     protected method Rotate {option x y}
+    protected method Rotate.old {option x y}
     protected method SendCmd { string }
     protected method Unmap {}
-    protected method Vmouse  {option b m x y}
-    protected method Vmouse2 {option b m x y}
+    protected method Vmouse {option b m x y}
     protected method Zoom {option {factor 10}}
 
@@ -344 +344 @@
     set _image(id) ""
 
-    # set up bindings for rotation
     if 0 {
+        # set up bindings to bridge mouse events to server
+        bind $itk_component(3dview) <ButtonPress> \
+            [itcl::code $this Vmouse click %b %s %x %y]
+        bind $itk_component(3dview) <ButtonRelease> \
+            [itcl::code $this Vmouse release %b %s %x %y]
+        bind $itk_component(3dview) <B1-Motion> \
+            [itcl::code $this Vmouse drag 1 %s %x %y]
+        bind $itk_component(3dview) <B2-Motion> \
+            [itcl::code $this Vmouse drag 2 %s %x %y]
+        bind $itk_component(3dview) <B3-Motion> \
+            [itcl::code $this Vmouse drag 3 %s %x %y]
+        bind $itk_component(3dview) <Motion> \
+            [itcl::code $this Vmouse move 0 %s %x %y]
+    } else {
+        # set up bindings for rotation with mouse
         bind $itk_component(3dview) <ButtonPress-1> \
             [itcl::code $this Rotate click %x %y]
@@ -352 +366 @@
         bind $itk_component(3dview) <ButtonRelease-1> \
             [itcl::code $this Rotate release %x %y]
-    } else {
-        bind $itk_component(3dview) <ButtonPress-1> \
-            [itcl::code $this Vmouse click %b %s %x %y]
-        bind $itk_component(3dview) <B1-Motion> \
-            [itcl::code $this Vmouse drag 1 %s %x %y]
-        bind $itk_component(3dview) <ButtonRelease-1> \
-            [itcl::code $this Vmouse release %b %s %x %y]
-    }
-
-    bind $itk_component(3dview) <ButtonPress-2> \
-        [itcl::code $this Pan click %x %y]
-    bind $itk_component(3dview) <B2-Motion> \
-        [itcl::code $this Pan drag %x %y]
-    bind $itk_component(3dview) <ButtonRelease-2> \
-        [itcl::code $this Pan release %x %y]
-
+
+        # set up bindings for panning with mouse
+        bind $itk_component(3dview) <ButtonPress-2> \
+            [itcl::code $this Pan click %x %y]
+        bind $itk_component(3dview) <B2-Motion> \
+            [itcl::code $this Pan drag %x %y]
+        bind $itk_component(3dview) <ButtonRelease-2> \
+            [itcl::code $this Pan release %x %y]
+
+        # scroll wheel zoom
+        if {[string equal "x11" [tk windowingsystem]]} {
+            bind $itk_component(3dview) <4> [itcl::code $this Zoom out 2]
+            bind $itk_component(3dview) <5> [itcl::code $this Zoom in 2]
+        }
+    }
+
+    # Set up bindings for panning with keyboard
     bind $itk_component(3dview) <KeyPress-Left> \
         [itcl::code $this Pan set -10 0]
@@ -384 +399 @@
     bind $itk_component(3dview) <Shift-KeyPress-Down> \
         [itcl::code $this Pan set 0 50]
+
+    # Set up bindings for zoom with keyboard
     bind $itk_component(3dview) <KeyPress-Prior> \
         [itcl::code $this Zoom out 2]
@@ -390 +407 @@
 
     bind $itk_component(3dview) <Enter> "focus $itk_component(3dview)"
-
-
-    if {[string equal "x11" [tk windowingsystem]]} {
-        bind $itk_component(3dview) <4> [itcl::code $this Zoom out 2]
-        bind $itk_component(3dview) <5> [itcl::code $this Zoom in 2]
-    }
-
-    # set up bindings to bridge mouse events to server
-    #bind $itk_component(3dview) <ButtonPress> \
-    #   [itcl::code $this Vmouse2 click %b %s %x %y]
-    #bind $itk_component(3dview) <ButtonRelease> \
-    #    [itcl::code $this Vmouse2 release %b %s %x %y]
-    #bind $itk_component(3dview) <B1-Motion> \
-    #    [itcl::code $this Vmouse2 drag 1 %s %x %y]
-    #bind $itk_component(3dview) <B2-Motion> \
-    #    [itcl::code $this Vmouse2 drag 2 %s %x %y]
-    #bind $itk_component(3dview) <B3-Motion> \
-    #    [itcl::code $this Vmouse2 drag 3 %s %x %y]
-    #bind $itk_component(3dview) <Motion> \
-    #    [itcl::code $this Vmouse2 move 0 %s %x %y]
 
     bind $itk_component(3dview) <Configure> \
@@ -1342 +1339 @@
 }
 
-
-itcl::body Rappture::MolvisViewer::Vmouse2 {option b m x y} {
+#
+# Send virtual mouse events using the vmouse command
+#
+itcl::body Rappture::MolvisViewer::Vmouse {option b m x y} {
     set now [clock clicks -milliseconds]
     set vButton [expr $b - 1]
@@ -1370 +1369 @@
 }
 
-itcl::body Rappture::MolvisViewer::Vmouse {option b m x y} {
+# ----------------------------------------------------------------------
+# USAGE: Rotate click <x> <y>
+# USAGE: Rotate drag <x> <y>
+# USAGE: Rotate release <x> <y>
+#
+# Called automatically when the user clicks/drags/releases in the
+# plot area.  Moves the plot according to the user's actions.
+# ----------------------------------------------------------------------
+itcl::body Rappture::MolvisViewer::Rotate {option x y} {
     set now  [clock clicks -milliseconds]
     # cancel any pending delayed dragging events
@@ -1386 +1393 @@
     if { $option == "drag" || $option == "release" } {
         set diff 0
-         catch { set diff [expr $now - $_mevent(time) ] }
-         if {$diff < 25 && $option == "drag" } { # 75ms between motion updates
-             set _mevent(afterid) [after [expr 25 - $diff] [itcl::code $this Vmouse drag $b $m $x $y]]
-             return
-         }
+        catch { set diff [expr $now - $_mevent(time) ] }
+        if {$diff < 25 && $option == "drag" } { # 75ms between motion updates
+            set _mevent(afterid) [after [expr 25 - $diff] [itcl::code $this Rotate drag $x $y]]
+            return
+        }
         set w [winfo width $itk_component(3dview)]
         set h [winfo height $itk_component(3dview)]
@@ -1438 +1445 @@
 
 # ----------------------------------------------------------------------
-# USAGE: Rotate click <x> <y>
-# USAGE: Rotate drag <x> <y>
-# USAGE: Rotate release <x> <y>
+# USAGE: Rotate.old click <x> <y>
+# USAGE: Rotate.old drag <x> <y>
+# USAGE: Rotate.old release <x> <y>
 #
 # Called automatically when the user clicks/drags/releases in the
 # plot area.  Moves the plot according to the user's actions.
 # ----------------------------------------------------------------------
-itcl::body Rappture::MolvisViewer::Rotate {option x y} {
+itcl::body Rappture::MolvisViewer::Rotate.old {option x y} {
     set now  [clock clicks -milliseconds]
     #update idletasks
@@ -1463 +1470 @@
         drag {
             if {[array size _click] == 0} {
-                Rotate click $x $y
+                Rotate.old click $x $y
             } else {
                 set w [winfo width $itk_component(3dview)]
@@ -1470 +1477 @@
                     return
                 }
-#         set diff 0
-#          catch { set diff [expr $now - $_mevent(time) ] }
-#          if {$diff < 175 && $option == "drag" } { # 75ms between motion updates
-#              set _mevent(afterid) [after [expr 175 - $diff] [itcl::code $this Rotate drag $x $y]]
-#              return
-#          }
+                #set diff 0
+                #catch { set diff [expr $now - $_mevent(time) ] }
+                #if {$diff < 75 && $option == "drag" } { # 75ms between motion updates
+                #    set _mevent(afterid) [after [expr 75 - $diff] [itcl::code $this Rotate.old drag $x $y]]
+                #    return
+                #}
 
                 if {[catch {
@@ -1530 +1537 @@
         }
         release {
-            Rotate drag $x $y
+            Rotate.old drag $x $y
             $itk_component(3dview) configure -cursor ""
             catch {unset _click}