Recreate the _get_data method and more event refactoring

blink1073 · blink1073 · commit 20527b69bed8 · 2014-12-20T14:38:22.000-06:00
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
@@ -1193,6 +1193,18 @@ def update(self):
             self.canvas.draw_idle()
         return False
 
+    def _get_data(self, event):
+        """Get the xdata and ydata for event, with limits"""
+        if event.xdata is None:
+            return None, None
+        x0, x1 = self.ax.get_xbound()
+        y0, y1 = self.ax.get_ybound()
+        xdata = max(x0, event.xdata)
+        xdata = min(x1, xdata)
+        ydata = max(y0, event.ydata)
+        ydata = min(y1, ydata)
+        return xdata, ydata
+
     def _clean_event(self, event):
         """Clean up an event
 
@@ -1204,14 +1216,8 @@ def _clean_event(self, event):
             event = self._prev_event
         else:
             event = copy.copy(event)
-
-        x0, x1 = self.ax.get_xbound()
-        y0, y1 = self.ax.get_ybound()
-        xdata = max(x0, event.xdata)
-        event.xdata = min(x1, xdata)
-        ydata = max(y0, event.ydata)
-        event.ydata = min(y1, ydata)
-
+        event.xdata, event.ydata = self._get_data(event)
+        
         self._prev_event = event
         return event
 
@@ -1232,10 +1238,11 @@ def press(self, event):
 
     def _release(self, event):
         """Button release event handler and validator"""
-        if not self.ignore(event):
+        if not self.ignore(event) and self.eventpress:
             event = self._clean_event(event)
             self.eventrelease = event
             self.release(event)
+            self.state.discard('move')
 
     def release(self, event):
         """Button release event handler"""
@@ -1799,9 +1806,9 @@ def onmove(self, event):
                     return
                 maxd = max(abs(dx_pix), abs(dy_pix))
                 if abs(dx_pix) < maxd:
-                    dx *= maxd / abs(dx_pix)
+                    dx *= maxd / (abs(dx_pix) + 1e-6)
                 if abs(dy_pix) < maxd:
-                    dy *= maxd / abs(dy_pix)
+                    dy *= maxd / (abs(dy_pix) + 1e-6)
 
             # from center
             if 'center' in self.state:
