Add method to add default state

ericpre · ericpre · commit 45d849c72ba9 · 2021-08-25T09:29:42.000+01:00
diff --git a/lib/matplotlib/tests/test_widgets.py b/lib/matplotlib/tests/test_widgets.py
@@ -171,6 +171,26 @@ def onselect(epress, erelease):
     assert tool.extents == (xdata_new, extents[1], ydata_new, extents[3])
 
 
+def test_rectangle_add_default_state():
+    ax = get_ax()
+
+    def onselect(epress, erelease):
+        pass
+
+    tool = widgets.RectangleSelector(ax, onselect, interactive=True)
+    # Create rectangle
+    _resize_rectangle(tool, 70, 65, 125, 130)
+
+    with pytest.raises(ValueError):
+        tool.add_default_state('unsupported_state')
+
+    with pytest.raises(ValueError):
+        tool.add_default_state('clear')
+    tool.add_default_state('move')
+    tool.add_default_state('square')
+    tool.add_default_state('center')
+
+
 @pytest.mark.parametrize('use_default_state', [True, False])
 def test_rectangle_resize_center(use_default_state):
     ax = get_ax()
@@ -184,7 +204,7 @@ def onselect(epress, erelease):
     assert tool.extents == (70.0, 125.0, 65.0, 130.0)
 
     if use_default_state:
-        tool._default_state.add('center')
+        tool.add_default_state('center')
         use_key = None
     else:
         use_key = 'control'
@@ -257,7 +277,7 @@ def onselect(epress, erelease):
     assert tool.extents == (70.0, 120.0, 65.0, 115.0)
 
     if use_default_state:
-        tool._default_state.add('square')
+        tool.add_default_state('square')
         use_key = None
     else:
         use_key = 'shift'
@@ -326,8 +346,8 @@ def onselect(epress, erelease):
     tool = widgets.RectangleSelector(ax, onselect, interactive=True)
     # Create rectangle
     _resize_rectangle(tool, 70, 65, 120, 115)
-    tool._default_state.add('square')
-    tool._default_state.add('center')
+    tool.add_default_state('square')
+    tool.add_default_state('center')
     assert tool.extents == (70.0, 120.0, 65.0, 115.0)
 
     # resize NE handle
@@ -727,6 +747,24 @@ def onselect(epress, erelease):
         assert artist.get_alpha() == 0.3
 
 
+def test_span_selector_add_default_state():
+    ax = get_ax()
+
+    def onselect(*args):
+        pass
+
+    tool = widgets.SpanSelector(ax, onselect, 'horizontal', interactive=True)
+
+    with pytest.raises(ValueError):
+        tool.add_default_state('unsupported_state')
+    with pytest.raises(ValueError):
+        tool.add_default_state('center')
+    with pytest.raises(ValueError):
+        tool.add_default_state('square')
+
+    tool.add_default_state('move')
+
+
 def test_tool_line_handle():
     ax = get_ax()
 
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
@@ -2044,6 +2044,40 @@ def set_handle_props(self, **handle_props):
             self.update()
         self._handle_props.update(handle_props)
 
+    @property
+    def default_state(self):
+        """
+        Default state of the selector, which affect the widget's behavior. See
+        the `state_modifier_keys` parameters for details.
+        """
+        return tuple(self._default_state)
+
+    def add_default_state(self, value):
+        """
+        Add a default state to define the widget's behavior. See the
+        `state_modifier_keys` parameters for details.
+
+        Parameters
+        ----------
+        value : str
+            Must be a supported state of the selector. See the
+            `state_modifier_keys` parameters for details.
+
+        Raises
+        ------
+        ValueError
+            When the value is not supported by the selector.
+
+        """
+        supported_default_state = [
+            key for key, value in self.state_modifier_keys.items()
+            if key != 'clear' and value != 'not-applicable'
+            ]
+        if value not in supported_default_state:
+            keys = ', '.join(supported_default_state)
+            raise ValueError('Setting default state must be one of the '
+                             f'following: {keys}.')
+        self._default_state.add(value)
 
 class SpanSelector(_SelectorWidget):
     """
@@ -2110,6 +2144,12 @@ def on_select(min: float, max: float) -> Any
         Distance in pixels within which the interactive tool handles can be
         activated.
 
+    state_modifier_keys : dict, optional
+        Keyboard modifiers which affect the widget's behavior.  Values
+        amend the defaults.
+
+        - "clear": Clear the current shape, default: "escape".
+
     drag_from_anywhere : bool, default: False
         If `True`, the widget can be moved by clicking anywhere within
         its bounds.
@@ -2138,9 +2178,15 @@ def on_select(min: float, max: float) -> Any
     def __init__(self, ax, onselect, direction, minspan=0, useblit=False,
                  props=None, onmove_callback=None, interactive=False,
                  button=None, handle_props=None, grab_range=10,
-                 drag_from_anywhere=False, ignore_event_outside=False):
+                 state_modifier_keys=None, drag_from_anywhere=False,
+                 ignore_event_outside=False):
 
-        super().__init__(ax, onselect, useblit=useblit, button=button)
+        if state_modifier_keys is None:
+            state_modifier_keys = dict(clear='escape',
+                                       square='not-applicable',
+                                       center='not-applicable')
+        super().__init__(ax, onselect, useblit=useblit, button=button,
+                         state_modifier_keys=state_modifier_keys)
 
         if props is None:
             props = dict(facecolor='red', alpha=0.5)
@@ -2425,7 +2471,7 @@ def _set_active_handle(self, event):
 
         # Prioritise center handle over other handles
         # Use 'C' to match the notation used in the RectangleSelector
-        if 'move' in self._state:
+        if 'move' in self._state | self._default_state:
             self._active_handle = 'C'
         elif e_dist > self.grab_range:
             # Not close to any handles
@@ -2706,8 +2752,7 @@ def onselect(eclick: MouseEvent, erelease: MouseEvent)
         - "move": Move the existing shape, default: no modifier.
         - "clear": Clear the current shape, default: "escape".
         - "square": Makes the shape square, default: "shift".
-        - "center": Make the initial point the center of the shape,
-          default: "ctrl".
+        - "center": change the shape around its center, default: "ctrl".
 
         "square" and "center" can be combined.
 
@@ -2869,7 +2914,6 @@ def _press(self, event):
         # button, ...
         if self._interactive and self._selection_artist.get_visible():
             self._set_active_handle(event)
-            self._extents_on_press = self.extents
         else:
             self._active_handle = None
 
@@ -2886,6 +2930,8 @@ def _press(self, event):
         else:
             self.set_visible(True)
 
+        self._extents_on_press = self.extents
+
         return False
 
     def _release(self, event):
@@ -3000,9 +3046,7 @@ def _onmove(self, event):
                         y1 = event.ydata
 
         # move existing shape
-        elif (self._active_handle == 'C' or
-              (self.drag_from_anywhere and self._contains(event)) and
-              self._extents_on_press is not None):
+        elif self._active_handle == 'C':
             x0, x1, y0, y1 = self._extents_on_press
             dx = event.xdata - self._eventpress.xdata
             dy = event.ydata - self._eventpress.ydata
@@ -3137,14 +3181,13 @@ def _set_active_handle(self, event):
         e_idx, e_dist = self._edge_handles.closest(event.x, event.y)
         m_idx, m_dist = self._center_handle.closest(event.x, event.y)
 
-        if 'move' in self._state:
+        if 'move' in self._state | self._default_state:
             self._active_handle = 'C'
         # Set active handle as closest handle, if mouse click is close enough.
         elif m_dist < self.grab_range * 2:
             # Prioritise center handle over other handles
             self._active_handle = 'C'
-        elif (c_dist > self.grab_range and
-                  e_dist > self.grab_range):
+        elif c_dist > self.grab_range and e_dist > self.grab_range:
             # Not close to any handles
             if self.drag_from_anywhere and self._contains(event):
                 # Check if we've clicked inside the region
