Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[WIP] Upgrade the LassoSelector #5751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 10 commits into from
Closed

[WIP] Upgrade the LassoSelector #5751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4dcdab9
Upgrade the lassoselector
blink1073 Dec 26, 2015
133c0ce
Fix failing test
blink1073 Dec 26, 2015
a2c36ba
Beef up the lasso selector test
blink1073 Dec 27, 2015
5e0e45b
Pep8 fixes
blink1073 Dec 27, 2015
f6f80de
Remove extra print statements
blink1073 Dec 28, 2015
5e6f9bd
Rename modifier to be more clear
blink1073 Dec 28, 2015
136e170
Rename modifier to be more clear
blink1073 Dec 28, 2015
176387f
Preserve backward compatibility for onmove
blink1073 Dec 28, 2015
e8b2aff
Revert changes to nbagg_uat
blink1073 Dec 28, 2015
327f2be
Clean up clear logic and handle key release
blink1073 Jan 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions lib/matplotlib/tests/test_widgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,15 +243,37 @@ def check_lasso_selector(**kwargs):

def onselect(verts):
ax._got_onselect = True
assert verts == [(100, 100), (125, 125), (150, 150)]
assert verts == [(100, 100), (125, 125), (126, 126), (130, 130),
(150, 150), (170, 170), (185, 185), (190, 190),
(195, 195), (100, 100)], verts

tool = widgets.LassoSelector(ax, onselect, **kwargs)
do_event(tool, 'press', xdata=100, ydata=100, button=1)
do_event(tool, 'onmove', xdata=125, ydata=125, button=1)
do_event(tool, 'release', xdata=150, ydata=150, button=1)
do_event(tool, 'onmove', xdata=126, ydata=126, button=1)
do_event(tool, 'onmove', xdata=127, ydata=127, button=1)
do_event(tool, 'onmove', key='shift', xdata=128, ydata=128, button=1)
do_event(tool, 'onmove', key='shift', xdata=129, ydata=129, button=1)
do_event(tool, 'onmove', key='shift', xdata=130, ydata=130, button=1)
do_event(tool, 'release', key='shift', xdata=150, ydata=150, button=1)
do_event(tool, 'onmove', key='shift', xdata=160, ydata=160, button=1)
do_event(tool, 'onmove', key='shift', xdata=170, ydata=170, button=1)
do_event(tool, 'press', key='shift', xdata=180, ydata=180, button=1)
do_event(tool, 'onmove', xdata=185, ydata=185, button=1)
do_event(tool, 'onmove', xdata=190, ydata=190, button=1)
do_event(tool, 'release', xdata=195, ydata=195, button=1)

assert ax._got_onselect

ax._got_onselect = False
do_event(tool, 'press', xdata=100, ydata=100, button=1)
do_event(tool, 'onmove', xdata=125, ydata=125, button=1)
do_event(tool, 'onmove', xdata=126, ydata=126, button=1)
do_event(tool, 'onmove', xdata=127, ydata=127, button=1)
do_event(tool, 'on_key_press', key='escape', button=1)
do_event(tool, 'release', button=1)
assert not ax._got_onselect


def test_lasso_selector():
check_lasso_selector()
Expand Down
82 changes: 64 additions & 18 deletions lib/matplotlib/widgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1478,6 +1478,8 @@ def __init__(self, ax, onselect, useblit=False, button=None,
self._prev_event = None
self.state = set()

self._override_press = False

def set_active(self, active):
AxesWidget.set_active(self, active)
if active:
Expand Down Expand Up @@ -1584,6 +1586,7 @@ def _clean_event(self, event):
def press(self, event):
"""Button press handler and validator"""
if not self.ignore(event):
self._override_press = False
event = self._clean_event(event)
self.eventpress = event
self._prev_event = event
Expand Down Expand Up @@ -1618,7 +1621,8 @@ def _release(self, event):

def onmove(self, event):
"""Cursor move event handler and validator"""
if not self.ignore(event) and self.eventpress:
valid_press = self.eventpress or self._override_press
if not self.ignore(event) and valid_press:
event = self._clean_event(event)
self._onmove(event)
return True
Expand Down Expand Up @@ -1646,6 +1650,7 @@ def on_key_press(self, event):
for artist in self.artists:
artist.set_visible(False)
self.update()
self.eventpress = None
return
for (state, modifier) in self.state_modifier_keys.items():
if modifier in key:
Expand Down Expand Up @@ -2073,8 +2078,10 @@ def __init__(self, ax, onselect, drawtype='box',
alpha=0.2, fill=True)
rectprops['animated'] = self.useblit
self.rectprops = rectprops
self.to_draw = self._shape_klass((0, 0),
0, 1, visible=False, **self.rectprops)
self.to_draw = (
self._shape_klass((0, 0), 0, 1, visible=False,
**self.rectprops)
)
self.ax.add_patch(self.to_draw)
if drawtype == 'line':
if lineprops is None:
Expand Down Expand Up @@ -2207,8 +2214,8 @@ def _onmove(self, event):
y2 = event.ydata

# move existing shape
elif (('move' in self.state or self.active_handle == 'C')
and self._extents_on_press is not None):
elif (('move' in self.state or self.active_handle == 'C') and
self._extents_on_press is not None):
x1, x2, y1, y2 = self._extents_on_press
dx = event.xdata - self.eventpress.xdata
dy = event.ydata - self.eventpress.ydata
Expand Down Expand Up @@ -2462,6 +2469,14 @@ class LassoSelector(_SelectorWidget):
*onselect* : function
Whenever the lasso is released, the `onselect` function is called and
passed the vertices of the selected path.
*persist*: boolean
Whether to leave the lasso drawn until the next one is drawn.

*state_modifier_keys* are keyboard modifiers that affect the behavior
of the widget.

The defaults are:
dict(polygon='shift', clear='escape')

Example usage::

Expand All @@ -2485,10 +2500,12 @@ def onselect(verts):
"""

def __init__(self, ax, onselect=None, useblit=True, lineprops=None,
button=None):
button=None, persist=False, state_modifier_keys=None):
_SelectorWidget.__init__(self, ax, onselect, useblit=useblit,
button=button)
button=button,
state_modifier_keys=state_modifier_keys)

self.state_modifier_keys.setdefault('polygon', 'shift')
self.verts = None

if lineprops is None:
Expand All @@ -2499,32 +2516,61 @@ def __init__(self, ax, onselect=None, useblit=True, lineprops=None,
self.line.set_visible(False)
self.ax.add_line(self.line)
self.artists = [self.line]
self.persist = persist

def onpress(self, event):
self.press(event)

def _press(self, event):
self.verts = [self._get_data(event)]
self.line.set_visible(True)
if (not event.key == self.state_modifier_keys['polygon'] or
self.verts is None):
self.verts = [(event.xdata, event.ydata)]

def _on_key_release(self, event):
if event.key == self.state_modifier_keys['polygon']:
if self._override_press:
self._finish(event)

def onrelease(self, event):
self.release(event)

def _release(self, event):
if self.verts is not None:
self.verts.append(self._get_data(event))
self.onselect(self.verts)
self.line.set_data([[], []])
self.line.set_visible(False)
def _finish(self, event):
self.verts.append(self.verts[0])
self.line.set_data(list(zip(*self.verts)))
self.onselect(self.verts)
if not self.persist:
self.line.set_data([[], []])
self.line.set_visible(False)
self._override_press = False
self.verts = None
self.update()

def _onmove(self, event):
def _release(self, event):
if self.verts is None:
return
self.verts.append(self._get_data(event))
self.verts.append((event.xdata, event.ydata))
if event.key != self.state_modifier_keys['polygon']:
self._finish(event)
else:
self._override_press = True
self.verts.append((event.xdata, event.ydata))
self.line.set_data(list(zip(*self.verts)))
self.update()

def _onmove(self, event):
if self.verts is None:
return
self.line.set_visible(True)
if event.key == self.state_modifier_keys['polygon']:
if len(self.verts) == 1:
self.verts.append((event.xdata, event.ydata))
else:
self.verts[-1] = (event.xdata, event.ydata)
elif event.button:
self.verts.append((event.xdata, event.ydata))
else:
return self._finish(event)
self.line.set_data(list(zip(*self.verts)))

self.update()


Expand Down