SF.net SVN: matplotlib:[7598] branches/v0_99_maint/lib/matplotlib

[<jd...@us...>]

Revision: 7598
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7598&view=rev
Author:   jdh2358
Date:     2009-08-30 13:35:12 +0000 (Sun, 30 Aug 2009)

Log Message:
-----------
applied Gael's ginput patch

Modified Paths:
--------------
    branches/v0_99_maint/lib/matplotlib/blocking_input.py
    branches/v0_99_maint/lib/matplotlib/figure.py

Modified: branches/v0_99_maint/lib/matplotlib/blocking_input.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/blocking_input.py	2009-08-30 10:33:01 UTC (rev 7597)
+++ branches/v0_99_maint/lib/matplotlib/blocking_input.py	2009-08-30 13:35:12 UTC (rev 7598)
@@ -17,9 +17,6 @@
     Note: Subclass of BlockingMouseInput.  Used by clabel
 """
 
-import time
-import numpy as np
-
 from matplotlib import path, verbose
 from matplotlib.cbook import is_sequence_of_strings
 
@@ -151,7 +148,7 @@
         button = event.button
 
         if button == self.button_pop:
-            self.mouse_event_pop(event,-1)
+            self.mouse_event_pop(event)
         elif button == self.button_stop:
             self.mouse_event_stop(event)
         else:
@@ -162,7 +159,7 @@
         Process a key click event.  This maps certain keys to appropriate
         mouse click events.
         '''
-        
+
         event = self.events[-1]
         key = event.key.lower()
 

Modified: branches/v0_99_maint/lib/matplotlib/figure.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/figure.py	2009-08-30 10:33:01 UTC (rev 7597)
+++ branches/v0_99_maint/lib/matplotlib/figure.py	2009-08-30 13:35:12 UTC (rev 7598)
@@ -12,7 +12,6 @@
 
 """
 import numpy as np
-import time
 
 import artist
 from artist import Artist, allow_rasterization
@@ -1105,6 +1104,12 @@
 
         Right clicking cancels last input.
 
+        The buttons used for the various actions (adding points, removing
+        points, terminating the inputs) can be overriden via the
+        arguments *mouse_add*, *mouse_pop* and *mouse_stop*, that give
+        the associated mouse button: 1 for left, 2 for middle, 3 for
+        right.
+
         The keyboard can also be used to select points in case your mouse
         does not have one or more of the buttons.  The delete and backspace
         keys act like right clicking (i.e., remove last point), the enter key


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.