Merge pull request matplotlib#1944 from mdboom/cancel-zoom

mdboom · mdboom · commit eb58bf66db38 · 2013-06-11T13:01:13.000-04:00
ValueError exception in drag_zoom (tk backend)
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -2750,6 +2750,18 @@ def press_pan(self, event):
 
     def press_zoom(self, event):
         """the press mouse button in zoom to rect mode callback"""
+        # If we're already in the middle of a zoom, pressing another
+        # button works to "cancel"
+        if self._ids_zoom != []:
+            for zoom_id in self._ids_zoom:
+                self.canvas.mpl_disconnect(zoom_id)
+            self.release(event)
+            self.draw()
+            self._xypress = None
+            self._button_pressed = None
+            self._ids_zoom = []
+            return
+
         if event.button == 1:
             self._button_pressed=1
         elif  event.button == 3:
