From 18bd2e6754548eba4d5973264beef92e053f474d Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Thu, 1 Jun 2023 08:47:20 +0200 Subject: [PATCH] Simplify delaxes. ... by inlining _reset_locators_and_formatters and _break_share_link; and, in the case of twinned axes, relying on groupers allowing the removal of elements not in the grouper at all. Also document that latter behavior. --- lib/matplotlib/cbook.py | 1 + lib/matplotlib/figure.py | 42 +++++++++++++++------------------------- 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py index ae78eab8318d..850028c297db 100644 --- a/lib/matplotlib/cbook.py +++ b/lib/matplotlib/cbook.py @@ -827,6 +827,7 @@ def joined(self, a, b): return (self._mapping.get(a, object()) is self._mapping.get(b)) def remove(self, a): + """Remove *a* from the grouper, doing nothing if it is not there.""" set_a = self._mapping.pop(a, None) if set_a: set_a.remove(a) diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py index 455a29dbce29..947f638b5f95 100644 --- a/lib/matplotlib/figure.py +++ b/lib/matplotlib/figure.py @@ -925,38 +925,28 @@ def delaxes(self, ax): Remove the `~.axes.Axes` *ax* from the figure; update the current Axes. """ - def _reset_locators_and_formatters(axis): - # Set the formatters and locators to be associated with axis - # (where previously they may have been associated with another - # Axis instance) - axis.get_major_formatter().set_axis(axis) - axis.get_major_locator().set_axis(axis) - axis.get_minor_formatter().set_axis(axis) - axis.get_minor_locator().set_axis(axis) - - def _break_share_link(ax, grouper): - siblings = grouper.get_siblings(ax) - if len(siblings) > 1: - grouper.remove(ax) - for last_ax in siblings: - if ax is not last_ax: - return last_ax - return None - self._axstack.remove(ax) self._axobservers.process("_axes_change_event", self) self.stale = True self._localaxes.remove(ax) self.canvas.release_mouse(ax) - # Break link between any shared axes - for name in ax._axis_names: - last_ax = _break_share_link(ax, ax._shared_axes[name]) - if last_ax is not None: - _reset_locators_and_formatters(last_ax._axis_map[name]) - - # Break link between any twinned axes - _break_share_link(ax, ax._twinned_axes) + for name in ax._axis_names: # Break link between any shared axes + grouper = ax._shared_axes[name] + siblings = [other for other in grouper.get_siblings(ax) if other is not ax] + if not siblings: # Axes was not shared along this axis; we're done. + continue + grouper.remove(ax) + # Formatters and locators may previously have been associated with the now + # removed axis. Update them to point to an axis still there (we can pick + # any of them, and use the first sibling). + remaining_axis = siblings[0]._axis_map[name] + remaining_axis.get_major_formatter().set_axis(remaining_axis) + remaining_axis.get_major_locator().set_axis(remaining_axis) + remaining_axis.get_minor_formatter().set_axis(remaining_axis) + remaining_axis.get_minor_locator().set_axis(remaining_axis) + + ax._twinned_axes.remove(ax) # Break link between any twinned axes. def clear(self, keep_observers=False): """ 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