Skip to content
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

Jump to bottom

Fix the return value of Axes.get_navigate_mode. #18173

Merged
merged 1 commit into from
Aug 5, 2020
Merged

Fix the return value of Axes.get_navigate_mode. #18173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions lib/matplotlib/backend_bases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2784,6 +2784,10 @@ class _Mode(str, Enum):
def __str__(self):
return self.value

@property
def _navigate_mode(self):
return self.name if self is not _Mode.NONE else None


class NavigationToolbar2:
"""
Expand Down Expand Up @@ -3047,7 +3051,7 @@ def pan(self, *args):
self.mode = _Mode.PAN
self.canvas.widgetlock(self)
for a in self.canvas.figure.get_axes():
a.set_navigate_mode(self.mode)
a.set_navigate_mode(self.mode._navigate_mode)
self.set_message(self.mode)

def press_pan(self, event):
Expand Down Expand Up @@ -3117,7 +3121,7 @@ def zoom(self, *args):
self.mode = _Mode.ZOOM
self.canvas.widgetlock(self)
for a in self.canvas.figure.get_axes():
a.set_navigate_mode(self.mode)
a.set_navigate_mode(self.mode._navigate_mode)
self.set_message(self.mode)

def press_zoom(self, event):
Expand Down
5 changes: 5 additions & 0 deletions lib/matplotlib/tests/test_backend_bases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,11 @@ def test_location_event_position(x, y):
def test_interactive_zoom():
fig, ax = plt.subplots()
ax.set(xscale="logit")
assert ax.get_navigate_mode() is None

tb = NavigationToolbar2(fig.canvas)
tb.zoom()
assert ax.get_navigate_mode() == 'ZOOM'

xlim0 = ax.get_xlim()
ylim0 = ax.get_ylim()
Expand Down Expand Up @@ -143,3 +145,6 @@ def test_interactive_zoom():
# Absolute tolerance much less than original xmin (1e-7).
assert ax.get_xlim() == pytest.approx(xlim0, rel=0, abs=1e-10)
assert ax.get_ylim() == pytest.approx(ylim0, rel=0, abs=1e-10)

tb.zoom()
assert ax.get_navigate_mode() is None