8000 Improved selection widget by blink1073 · Pull Request #3502 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Improved selection widget #3502

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

Merged
merged 18 commits into from
Nov 13, 2014
Merged

Improved selection widget #3502

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
61ab6df
Factor more behavior into the _SelectorWidget class.
blink1073 Sep 11, 2014
e43c788
Fix indentation
blink1073 Sep 12, 2014
ea732ef
Put onselect in __init__, fix syntax error, make sure lines are anima…
blink1073 Sep 12, 2014
900a6ea
Add tests for the selection widgets
blink1073 Sep 12, 2014
706b5b4
Remove private event handling methods to allow for subclassing old api
blink1073 Sep 12, 2014
ffd715a
Remove draw_rubberband and minor cleanup
blink1073 Sep 12, 2014
53b6056
Add to default_test_modules
blink1073 Oct 19, 2014
ddfcf59
Attempt to fix affine transform error
blink1073 Nov 9, 2014
76721c1
Fix affine transform error
blink1073 Nov 9, 2014
cf66812
Add test cleanup decorator
blink1073 Nov 10, 2014
babc377
Move cleanup to the individual checks
blink1073 Nov 10, 2014
cf58c0a
Fix failing tests
blink1073 Nov 11, 2014
f3261cf
Fix pep8 error
blink1073 Nov 11, 2014
c25efbd
Improve handling of out-of-bounds releases
blink1073 Nov 11, 2014
ce93c98
Revert changes to setupext.py
blink1073 Nov 12, 2014
51c70f0
Style change and use self.blit instead of blit.
blink1073 Nov 12, 2014
d711940
MNT : pep8 + pyflake changes
tacaswell Nov 11, 2014
86f28fa
TST : ensure canvas drawn before testing widets
tacaswell Nov 11, 2014
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
Prev Previous commit
Next Next commit
Put onselect in __init__, fix syntax error, make sure lines are anima… 
…ted.
  • Loading branch information
@blink1073
blink1073 committed Nov 12, 2014
commit ea732ef0d1f48e8c2d49a483a6c6b3f73dd5fbab
10 changes: 8 additions & 2 deletions lib/matplotlib/widgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1101,6 +1101,7 @@ def __init__(self, ax, onselect, useblit=False, button=None):
AxesWidget.__init__(self, ax)

self.visible = True
self.onselect = onselect
self.connect_default_events()

self.background = None
Expand Down Expand Up @@ -1130,7 +1131,7 @@ def update_background(self, event):
self.background = self.canvas.copy_from_bbox(self.ax.bbox)

def connect_default_events(self):
"""Connect the major canvas events to methods.""""
"""Connect the major canvas events to methods."""
self.connect_event('motion_notify_event', self._onmove)
self.connect_event('button_press_event', self._press)
self.connect_event('button_release_event', self._release)
Expand Down Expand Up @@ -1357,7 +1358,8 @@ def __init__(self, ax, onselect, direction, minspan=None, useblit=False,
def new_axes(self, ax):
self.ax = ax
if self.canvas is not ax.figure.canvas:
self.disconnect_events()
if not self.canvas is None:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

flip this to self.canvas is not None please.

self.disconnect_events()

self.canvas = ax.figure.canvas
self.connect_default_events()
Expand Down Expand Up @@ -1572,6 +1574,8 @@ def __init__(self, ax, onselect, drawtype='box',
lineprops = dict(color='black', linestyle='-',
linewidth=2, alpha=0.5)
self.lineprops = lineprops
if useblit:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should use self.useblit here as it has been semi-validated.

self.lineprops['animated'] = True
self.to_draw = Line2D([0, 0], [0, 0], visible=False,
**self.lineprops)
self.ax.add_line(self.to_draw)
Expand Down Expand Up @@ -1705,6 +1709,8 @@ def __init__(self, ax, onselect=None, useblit=True, lineprops=None,

if lineprops is None:
lineprops = dict()
if useblit:
lineprops['animated'] = True
self.line = Line2D([], [], **lineprops)
self.line.set_visible(False)
self.ax.add_line(self.line)
Expand Down
0