ENH: Subpanels

jklymak · jklymak · commit 91027f7f244a · 2020-09-15T10:35:07.000-07:00
diff --git a/lib/matplotlib/_constrained_layout.py b/lib/matplotlib/_constrained_layout.py
@@ -207,8 +207,7 @@ def _make_layout_margins(fig, renderer, *, w_pad=0, h_pad=0,
                                            hspace=hspace, wspace=wspace)
         panel._layoutgrid.parent.edit_outer_margin_mins(margins, ss)
 
-    # for ax in [a for a in fig._localaxes if hasattr(a, 'get_subplotspec')]:
-    for ax in fig.get_axes():
+    for ax in fig._localaxes:
         if not hasattr(ax, 'get_subplotspec') or not ax.get_in_layout():
             continue
 
@@ -223,7 +222,6 @@ def _make_layout_margins(fig, renderer, *, w_pad=0, h_pad=0,
                                            hspace=hspace, wspace=wspace)
         margin0 = margin.copy()
         pos, bbox = _get_pos_and_bbox(ax, renderer)
-
         # the margin is the distance between the bounding box of the axes
         # and its position (plus the padding from above)
         margin['left'] += pos.x0 - bbox.x0
@@ -455,9 +453,7 @@ def _reposition_axes(fig, renderer, *, w_pad=0, h_pad=0, hspace=0, wspace=0):
                          w_pad=w_pad, h_pad=h_pad,
                          wspace=wspace, hspace=hspace)
 
-    # for ax in fig._localaxes:
-    #     if not hasattr(a, 'get_subplotspec'):
-    for ax in fig.get_axes():
+    for ax in fig._localaxes:
         if not hasattr(ax, 'get_subplotspec') or not ax.get_in_layout():
             continue
 
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -39,6 +39,31 @@
 _log = logging.getLogger(__name__)
 
 
+class _InsetLocator:
+    """
+    Axes locator for `.Axes.inset_axes`.
+
+    The locater is a callable object used in `.Axes.set_aspect` to compute the
+    axes location depending on the renderer.
+    """
+
+    def __init__(self, bounds, transform):
+        """
+        *bounds* (a ``[l, b, w, h]`` rectangle) and *transform* together
+        specify the position of the inset axes.
+        """
+        self._bounds = bounds
+        self._transform = transform
+
+    def __call__(self, ax, renderer):
+        # Subtracting transPanel will typically rely on inverted(), freezing
+        # the transform; thus, this needs to be delayed until draw time as
+        # transPanel may otherwise change after this is evaluated.
+        return mtransforms.TransformedBbox(
+            mtransforms.Bbox.from_bounds(*self._bounds),
+            self._transform - ax.figure.transPanel)
+
+
 # The axes module contains all the wrappers to plotting functions.
 # All the other methods should go in the _AxesBase class.
 
@@ -449,7 +474,7 @@ def indicate_inset(self, bounds, inset_ax=None, *, transform=None,
 
             # decide which two of the lines to keep visible....
             pos = inset_ax.get_position()
-            bboxins = pos.transformed(self.figure.transFigure)
+            bboxins = pos.transformed(self.figure.transPanel)
             rectbbox = mtransforms.Bbox.from_bounds(
                 *bounds
             ).transformed(transform)
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -666,7 +666,7 @@ def set_figure(self, fig):
         super().set_figure(fig)
 
         self.bbox = mtransforms.TransformedBbox(self._position,
-                                                fig.transFigure)
+                                                fig.transPanel)
         # these will be updated later as data is added
         self.dataLim = mtransforms.Bbox.null()
         self._viewLim = mtransforms.Bbox.unit()
@@ -1645,9 +1645,11 @@ def apply_aspect(self, position=None):
             self._set_position(position, which='active')
             return
 
-        fig_width, fig_height = self.get_figure().get_size_inches()
-        fig_aspect = fig_height / fig_width
-
+        trans = self.get_figure().transPanel
+        bb = mtransforms.Bbox.from_bounds(0, 0, 1, 1).transformed(trans)
+        # this is the physical aspect of the panel (or figure):
+        fig_aspect = bb.height / bb.width
+        
         if self._adjustable == 'box':
             if self in self._twinned_axes:
                 raise RuntimeError("Adjustable 'box' is not allowed in a "
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
