Merge pull request matplotlib#18673 from anntzer/parasite-cleanup

Small cleanups to parasite axes.

Author: QuLogic

doc/api/next_api_changes/deprecations/18673-AL.rst

@@ -0,0 +1,3 @@
+``ParasiteAxesAuxTransBase.update_viewlim``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+... is deprecated; use ``apply_aspect`` instead.

examples/axes_grid1/parasite_simple2.py

@@ -23,7 +23,6 @@
 
 aux_trans = mtransforms.Affine2D().scale(pm_to_kms, 1.)
 ax_pm = ax_kms.twin(aux_trans)
-ax_pm.set_viewlim_mode("transform")
 
 for n, ds, dse, w, we in obs:
     time = ((2007 + (10. + 4/30.)/12) - 1988.5)

lib/mpl_toolkits/axes_grid1/parasite_axes.py

@@ -13,7 +13,6 @@ class ParasiteAxesBase:
     def get_images_artists(self):
         artists = {a for a in self.get_children() if a.get_visible()}
         images = {a for a in self.images if a.get_visible()}
-
         return list(images), list(artists - images)
 
     def __init__(self, parent_axes, **kwargs):
@@ -23,19 +22,9 @@ def __init__(self, parent_axes, **kwargs):
 
     def cla(self):
         super().cla()
-
         martist.setp(self.get_children(), visible=False)
         self._get_lines = self._parent_axes._get_lines
 
-        # In mpl's Axes, zorders of x- and y-axis are originally set
-        # within Axes.draw().
-        if self._axisbelow:
-            self.xaxis.set_zorder(0.5)
-            self.yaxis.set_zorder(0.5)
-        else:
-            self.xaxis.set_zorder(2.5)
-            self.yaxis.set_zorder(2.5)
-
     def pick(self, mouseevent):
         # This most likely goes to Artist.pick (depending on axes_class given
         # to the factory), which only handles pick events registered on the
@@ -74,17 +63,12 @@ def __init__(self, parent_axes, aux_transform, viewlim_mode=None,
         super().__init__(parent_axes, **kwargs)
 
     def _set_lim_and_transforms(self):
-
         self.transAxes = self._parent_axes.transAxes
-
-        self.transData = \
-            self.transAux + \
-            self._parent_axes.transData
-
+        self.transData = self.transAux + self._parent_axes.transData
         self._xaxis_transform = mtransforms.blended_transform_factory(
-                self.transData, self.transAxes)
+            self.transData, self.transAxes)
         self._yaxis_transform = mtransforms.blended_transform_factory(
-                self.transAxes, self.transData)
+            self.transAxes, self.transData)
 
     def set_viewlim_mode(self, mode):
         _api.check_in_list([None, "equal", "transform"], mode=mode)
@@ -93,7 +77,11 @@ def set_viewlim_mode(self, mode):
     def get_viewlim_mode(self):
         return self._viewlim_mode
 
+    @cbook.deprecated("3.4", alternative="apply_aspect")
     def update_viewlim(self):
+        return self._update_viewlim()
+
+    def _update_viewlim(self):  # Inline after deprecation elapses.
         viewlim = self._parent_axes.viewLim.frozen()
         mode = self.get_viewlim_mode()
         if mode is None:
@@ -107,7 +95,7 @@ def update_viewlim(self):
             _api.check_in_list([None, "equal", "transform"], mode=mode)
 
     def apply_aspect(self, position=None):
-        self.update_viewlim()
+        self._update_viewlim()
         super().apply_aspect()
 
 
@@ -204,9 +192,9 @@ def twinx(self, axes_class=None):
 
         parasite_axes_class = parasite_axes_class_factory(axes_class)
 
-        ax2 = parasite_axes_class(self, sharex=self, frameon=False)
+        ax2 = parasite_axes_class(self, sharex=self)
         self.parasites.append(ax2)
-        ax2._remove_method = self._remove_twinx
+        ax2._remove_method = self._remove_any_twin
 
         self.axis["right"].set_visible(False)
 
@@ -215,11 +203,6 @@ def twinx(self, axes_class=None):
 
         return ax2
 
-    def _remove_twinx(self, ax):
-        self.parasites.remove(ax)
-        self.axis["right"].set_visible(True)
-        self.axis["right"].toggle(ticklabels=False, label=False)
-
     def twiny(self, axes_class=None):
         """
         Create a twin of Axes with a shared y-axis but independent x-axis.
@@ -232,9 +215,9 @@ def twiny(self, axes_class=None):
 
         parasite_axes_class = parasite_axes_class_factory(axes_class)
 
-        ax2 = parasite_axes_class(self, sharey=self, frameon=False)
+        ax2 = parasite_axes_class(self, sharey=self)
         self.parasites.append(ax2)
-        ax2._remove_method = self._remove_twiny
+        ax2._remove_method = self._remove_any_twin
 
         self.axis["top"].set_visible(False)
 
@@ -243,11 +226,6 @@ def twiny(self, axes_class=None):
 
         return ax2
 
-    def _remove_twiny(self, ax):
-        self.parasites.remove(ax)
-        self.axis["top"].set_visible(True)
-        self.axis["top"].toggle(ticklabels=False, label=False)
-
     def twin(self, aux_trans=None, axes_class=None):
         """
         Create a twin of Axes with no shared axis.
@@ -262,27 +240,29 @@ def twin(self, aux_trans=None, axes_class=None):
             parasite_axes_auxtrans_class_factory(axes_class)
 
         if aux_trans is None:
-            ax2 = parasite_axes_auxtrans_class(
-                self, mtransforms.IdentityTransform(), viewlim_mode="equal")
-        else:
-            ax2 = parasite_axes_auxtrans_class(
-                self, aux_trans, viewlim_mode="transform")
+            aux_trans = mtransforms.IdentityTransform()
+        ax2 = parasite_axes_auxtrans_class(
+            self, aux_trans, viewlim_mode="transform")
         self.parasites.append(ax2)
-        ax2._remove_method = self.parasites.remove
+        ax2._remove_method = self._remove_any_twin
 
         self.axis["top", "right"].set_visible(False)
 
         ax2.axis["top", "right"].set_visible(True)
         ax2.axis["left", "bottom"].set_visible(False)
 
-        def _remove_method(h):
-            self.parasites.remove(h)
-            self.axis["top", "right"].set_visible(True)
-            self.axis["top", "right"].toggle(ticklabels=False, label=False)
-        ax2._remove_method = _remove_method
-
         return ax2
 
+    def _remove_any_twin(self, ax):
+        self.parasites.remove(ax)
+        restore = ["top", "right"]
+        if ax._sharex:
+            restore.remove("top")
+        if ax._sharey:
+            restore.remove("right")
+        self.axis[tuple(restore)].set_visible(True)
+        self.axis[tuple(restore)].toggle(ticklabels=False, label=False)
+
     def get_tightbbox(self, renderer, call_axes_locator=True,
                       bbox_extra_artists=None):
         bbs = [