Merge pull request #1 from tacaswell/blink_improve_selection_widgets

blink1073 · blink1073 · commit dfcb0b7c12f6 · 2014-11-11T15:12:50.000-06:00
Blink improve selection widgets
diff --git a/lib/matplotlib/tests/test_widgets.py b/lib/matplotlib/tests/test_widgets.py
@@ -65,8 +65,9 @@ def get_event(ax, button=1, xdata=0, ydata=0, key=None, step=1):
 
 @cleanup
 def check_rectangle(**kwargs):
-    ax = plt.gca()
+    fig, ax = plt.subplots(1, 1)
     ax.plot([0, 200], [0, 200])
+    ax.figure.canvas.draw()
 
     def onselect(epress, erelease):
         ax._got_onselect = True
@@ -100,8 +101,9 @@ def test_rectangle_selector():
 
 @cleanup
 def check_span(*args, **kwargs):
-    ax = plt.gca()
+    fig, ax = plt.subplots(1, 1)
     ax.plot([0, 200], [0, 200])
+    ax.figure.canvas.draw()
 
     def onselect(vmin, vmax):
         ax._got_onselect = True
@@ -140,8 +142,10 @@ def test_span_selector():
 
 @cleanup
 def check_lasso_selector(**kwargs):
+    fig, ax = plt.subplots(1, 1)
     ax = plt.gca()
     ax.plot([0, 200], [0, 200])
+    ax.figure.canvas.draw()
 
     def onselect(verts):
         ax._got_onselect = True
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
@@ -1155,7 +1155,7 @@ def ignore(self, event):
         # Only do rectangle selection if event was triggered
         # with a desired button
         if self.validButtons is not None:
-            if not event.button in self.validButtons:
+            if event.button not in self.validButtons:
                 return True
 
         # If no button was pressed yet ignore the event if it was out
@@ -1164,7 +1164,7 @@ def ignore(self, event):
             return event.inaxes != self.ax
 
         # If a button was pressed, check if the release-button is the
-        # same. 
+        # same.
         if event.button == self.eventpress.button:
             return False
 
@@ -1182,16 +1182,10 @@ def update(self):
             if self.background is not None:
                 self.canvas.restore_region(self.background)
             for artist in self.artists:
-                try:
-                    self.ax.draw_artist(artist)
-                except AssertionError:
-                    self.canvas.draw_idle()
-                    return False
-            try:
-                self.canvas.blit(self.ax.bbox)
-            except AttributeError:
-                self.canvas.draw_idle()
-                return False
+                self.ax.draw_artist(artist)
+
+            self.canvas.blit(self.ax.bbox)
+
         else:
             self.canvas.draw_idle()
         return False
@@ -1217,7 +1211,7 @@ def press(self, event):
 
     def release(self, event):
         """Button release event"""
-        if not self.ignore(event) and not self.eventpress is None:
+        if not self.ignore(event) and self.eventpress is not None:
             self.eventrelease = copy.copy(event)
             self.eventrelease.xdata, self.eventrelease.ydata = (
                 self._get_data(event))
