Add test using tool handles

blink1073 · blink1073 · commit 739ab6e5ed9c · 2014-12-19T09:41:27.000-06:00
diff --git a/lib/matplotlib/tests/test_widgets.py b/lib/matplotlib/tests/test_widgets.py
@@ -73,14 +73,14 @@ def onselect(epress, erelease):
         ax._got_onselect = True
         assert epress.xdata == 100
         assert epress.ydata == 100
-        assert erelease.xdata == 200
-        assert erelease.ydata == 200
+        assert erelease.xdata == 199
+        assert erelease.ydata == 199
 
     tool = widgets.RectangleSelector(ax, onselect, **kwargs)
     event = get_event(ax, xdata=100, ydata=100, button=1)
     tool.press(event)
 
-    event = get_event(ax, xdata=125, ydata=125, button=1)
+    event = get_event(ax, xdata=199, ydata=199, button=1)
     tool.onmove(event)
 
     # purposely drag outside of axis for release
@@ -99,6 +99,50 @@ def test_rectangle_selector():
     check_rectangle(rectprops=dict(fill=True))
 
 
+def test_rectangle_modifiers():
+    # TODO: add tests for center, square, center, shift+drag
+    pass
+
+
+def test_rectangle_handles():
+    fig, ax = plt.subplots(1, 1)
+    ax.plot([0, 200], [0, 200])
+    ax.figure.canvas.draw()
+
+    def onselect(epress, erelease):
+        pass
+
+    tool = widgets.RectangleSelector(ax, onselect=onselect,
+                                     maxdist=10)
+    event = get_event(ax, xdata=100, ydata=100, button=1)
+    tool.press(event)
+
+    tool.extents = (100, 150, 100, 150)
+
+    assert tool.corners == (
+        (100, 150, 150, 100), (100, 100, 150, 150))
+    assert tool.extents == (100, 150, 100, 150)
+    assert tool.edge_centers == (
+        (100, 125.0, 150, 125.0), (125.0, 100, 125.0, 150))
+    assert tool.extents == (100, 150, 100, 150)
+
+    # grab a corner and move it
+    event = get_event(ax, xdata=100, ydata=100)
+    tool.press(event)
+    event = get_event(ax, xdata=120, ydata=120)
+    tool.onmove(event)
+    tool.release(event)
+    assert tool.extents ==  (120, 150, 120, 150)
+
+    # create a new rectangle
+    event = get_event(ax, xdata=10, ydata=10)
+    tool.press(event)
+    event = get_event(ax, xdata=100, ydata=100)
+    tool.onmove(event)
+    tool.release(event)
+    assert tool.extents == (10, 100, 10, 100)
+
+
 @cleanup
 def check_span(*args, **kwargs):
     fig, ax = plt.subplots(1, 1)
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
@@ -1509,6 +1509,7 @@ def closest(self, x, y):
         else:
             return 0, np.sqrt(np.sum(diff ** 2))
 
+
 class RectangleSelector(_SelectorWidget):
     """
     Select a rectangular region of an axes.
@@ -1638,7 +1639,7 @@ def __init__(self, ax, onselect, drawtype='patch',
         if rectprops is None:
             props = dict(mec='r')
         else:
-            props = dict(mec=rectprops['edgecolor'])
+            props = dict(mec=rectprops.get('edgecolor', 'k'))
         self._corner_order = ['NW', 'NE', 'SE', 'SW']
         xc, yc = self.corners
         self._corner_handles = ToolHandles(self.ax, xc, yc, marker_props=props,
@@ -1922,12 +1923,6 @@ def _rect_bbox(self):
             y0, y1 = min(y), max(y)
             return x0, y0, x1 - x0, y1 - y0
 
-    @property
-    def geometry(self):
-        x0, y0, width, height = self._rect_bbox
-        return x0 + width / 2., y0 + width / 2., width, height
-
-
 
 class LassoSelector(_SelectorWidget):
     """Selection curve of an arbitrary shape.
