Skip to content

Fix configure subplots #18306

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 4 commits into from
Aug 24, 2020
Merged

Fix configure subplots #18306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c48cbd
allow Gcf to destroy unknown managers
richardsheridan Aug 19, 2020
f61ac07
keep a reference to the output of subplot_tool to preserve callback w…
richardsheridan Aug 19, 2020
673afe7
document reference requirement
richardsheridan Aug 20, 2020
2c9a85b
solve nbagg recursion bug within nbagg
richardsheridan Aug 20, 2020
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
7 changes: 3 additions & 4 deletions lib/matplotlib/_pylab_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,17 @@ def destroy(cls, num):
It is recommended to pass a manager instance, to avoid confusion when
two managers share the same number.
"""
if all(hasattr(num, attr) for attr in ["num", "_cidgcf", "destroy"]):
if all(hasattr(num, attr) for attr in ["num", "destroy"]):
manager = num
if cls.figs.get(manager.num) is manager:
cls.figs.pop(manager.num)
else:
return
else:
try:
manager = cls.figs.pop(num)
except KeyError:
return
manager.canvas.mpl_disconnect(manager._cidgcf)
if hasattr(manager, "_cidgcf"):
manager.canvas.mpl_disconnect(manager._cidgcf)
manager.destroy()
gc.collect(1)

Expand Down
4 changes: 2 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 @@ -3294,8 +3294,8 @@ def _update_view(self):

def configure_subplots(self, *args):
plt = _safe_pyplot_import()
tool = plt.subplot_tool(self.canvas.figure)
tool.figure.canvas.manager.show()
self.subplot_tool = plt.subplot_tool(self.canvas.figure)
self.subplot_tool.figure.canvas.manager.show()

def save_figure(self, *args):
"""Save the current figure."""
Expand Down
7 changes: 6 additions & 1 deletion lib/matplotlib/backends/backend_nbagg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,12 @@ def new_figure_manager_given_figure(num, figure):
if is_interactive():
manager.show()
figure.canvas.draw_idle()
canvas.mpl_connect('close_event', lambda event: Gcf.destroy(manager))

def destroy(event):
canvas.mpl_disconnect(cid)
Gcf.destroy(manager)

cid = canvas.mpl_connect('close_event', destroy)
return manager

@staticmethod
Expand Down
3 changes: 2 additions & 1 deletion lib/matplotlib/pyplot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1546,7 +1546,8 @@ def subplot_tool(targetfig=None):
"""
Launch a subplot tool window for a figure.

A `matplotlib.widgets.SubplotTool` instance is returned.
A `matplotlib.widgets.SubplotTool` instance is returned. You must maintain
a reference to the instance to keep the associated callbacks alive.
"""
if targetfig is None:
targetfig = gcf()
Expand Down