Merge pull request #21921 from dstansby/rect-sel-clean

timhoffm · web-flow · commit 6e155972ecb5 · 2021-12-12T23:40:01.000+01:00
Clean up RectangleSelector move code
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
@@ -2984,6 +2984,7 @@ def _press(self, event):
             self.update()
 
         if self._active_handle is None and not self.ignore_event_outside:
+            # Start drawing a new rectangle
             x = event.xdata
             y = event.ydata
             self.visible = False
@@ -3050,16 +3051,28 @@ def _release(self, event):
         return False
 
     def _onmove(self, event):
-        """Motion notify event handler."""
+        """
+        Motion notify event handler.
 
+        This can do one of four things:
+        - Translate
+        - Rotate
+        - Re-size
+        - Continue the creation of a new shape
+        """
         state = self._state
         rotate = ('rotate' in state and
                   self._active_handle in self._corner_order)
         eventpress = self._eventpress
         # The calculations are done for rotation at zero: we apply inverse
         # transformation to events except when we rotate and move
+        state = self._state
+        rotate = ('rotate' in state and
+                  self._active_handle in self._corner_order)
         move = self._active_handle == 'C'
-        if not move and not rotate:
+        resize = self._active_handle and not move
+
+        if resize:
             inv_tr = self._get_rotation_transform().inverted()
             event.xdata, event.ydata = inv_tr.transform(
                 [event.xdata, event.ydata])
@@ -3090,8 +3103,7 @@ def _onmove(self, event):
                      np.arctan2(a[1]-b[1], a[0]-b[0]))
             self.rotation = np.rad2deg(self._rotation_on_press + angle)
 
-        # resize an existing shape
-        elif self._active_handle and self._active_handle != 'C':
+        elif resize:
             size_on_press = [x1 - x0, y1 - y0]
             center = [x0 + size_on_press[0] / 2, y0 + size_on_press[1] / 2]
 
@@ -3123,13 +3135,10 @@ def _onmove(self, event):
             else:
                 # change sign of relative changes to simplify calculation
                 # Switch variables so that x1 and/or y1 are updated on move
-                x_factor = y_factor = 1
                 if 'W' in self._active_handle:
                     x0 = x1
-                    x_factor *= -1
                 if 'S' in self._active_handle:
                     y0 = y1
-                    y_factor *= -1
                 if self._active_handle in ['E', 'W'] + self._corner_order:
                     x1 = event.xdata
                 if self._active_handle in ['N', 'S'] + self._corner_order:
@@ -3147,8 +3156,7 @@ def _onmove(self, event):
                         x1 = x0 + sign * abs(y1 - y0) * \
                             self._aspect_ratio_correction
 
-        # move existing shape
-        elif self._active_handle == 'C':
+        elif move:
             x0, x1, y0, y1 = self._extents_on_press
             dx = event.xdata - eventpress.xdata
             dy = event.ydata - eventpress.ydata
@@ -3157,8 +3165,8 @@ def _onmove(self, event):
             y0 += dy
             y1 += dy
 
-        # new shape
         else:
+            # Create a new shape
             self._rotation = 0
             # Don't create a new rectangle if there is already one when
             # ignore_event_outside=True
