diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
index 3f63879e4456..38a7254488b2 100644
--- a/lib/matplotlib/widgets.py
+++ b/lib/matplotlib/widgets.py
@@ -2985,6 +2985,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
@@ -3051,16 +3052,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])
@@ -3091,8 +3104,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]
@@ -3124,13 +3136,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:
@@ -3148,8 +3157,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
@@ -3158,8 +3166,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
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy