Minor internal improvements

Author: lukelbd

proplot/axes/base.py

@@ -646,6 +646,21 @@
 docstring._snippet_manager['axes.legend_kwargs'] = _legend_kwargs_docstring
 
 
+def _align_bbox(align, length):
+    """
+    Return a simple alignment bounding box for intersection calculations.
+    """
+    if align in ('left', 'bottom'):
+        bounds = [[0, 0], [length, 0]]
+    elif align in ('top', 'right'):
+        bounds = [[1 - length, 0], [1, 0]]
+    elif align == 'center':
+        bounds = [[0.5 * (1 - length), 0], [0.5 * (1 + length), 0]]
+    else:
+        raise ValueError(f'Invalid align {align!r}.')
+    return mtransforms.Bbox(bounds)
+
+
 class _TransformedBoundsLocator:
     """
     Axes locator for `~Axes.inset_axes` and other axes.
@@ -856,15 +871,6 @@ def _add_guide_panel(self, loc='fill', align='center', length=0, **kwargs):
         """
         Add a panel to be filled by an "outer" colorbar or legend.
         """
-        # Helper function: Return bounds inferred from given align setting.
-        def _align_bbox(align, length):
-            if align in ('left', 'bottom'):
-                bounds = [[0, 0], [length, 0]]
-            elif align in ('top', 'right'):
-                bounds = [[1 - length, 0], [1, 0]]
-            else:
-                bounds = [[0.5 * (1 - length), 0], [0.5 * (1 + length), 0]]
-            return mtransforms.Bbox(bounds)
         # NOTE: For colorbars we include 'length' when determining whether to allocate
         # new panel but for legend just test whether that 'align' position was filled.
         # WARNING: Hide content but 1) do not use ax.set_visible(False) so that
@@ -878,7 +884,7 @@ def _align_bbox(align, length):
             for pax in self._panel_dict[loc]:
                 if not pax._panel_hidden or align in pax._panel_align:
                     continue
-                if not any(bbox.overlaps(_align_bbox(a, l)) for a, l in pax._panel_align.items()):  # noqa: E501
+                if not any(bbox.overlaps(b) for b in pax._panel_align.values()):
                     ax = pax
                     break
             if ax is None:
@@ -891,7 +897,7 @@ def _align_bbox(align, length):
         ax.yaxis.set_visible(False)
         ax.patch.set_facecolor('none')
         ax._panel_hidden = True
-        ax._panel_align[align] = length
+        ax._panel_align[align] = bbox
         return ax
 
     def _add_inset_axes(

proplot/gridspec.py

@@ -468,23 +468,21 @@ def _parse_panel_arg(self, side, arg):
             array = self._fpanels[side]
             nacross = self._ncols_total if side in ('left', 'right') else self._nrows_total  # noqa: E501
             npanels, nalong = array.shape
-            arg = _not_none(arg, (1, nalong))
-            arg = np.atleast_1d(arg)
+            arg = np.atleast_1d(_not_none(arg, (1, nalong)))
             if arg.size not in (1, 2):
                 raise ValueError(f'Invalid span={arg!r}. Must be scalar or 2-tuple of coordinates.')  # noqa: E501
             if any(s < 1 or s > nalong for s in arg):
                 raise ValueError(f'Invalid span={arg!r}. Coordinates must satisfy 1 <= c <= {nalong}.')  # noqa: E501
             start, stop = arg[0] - 1, arg[-1]  # non-inclusive starting at zero
             iratio = -1 if side in ('left', 'top') else nacross  # default values
             for i in range(npanels):  # possibly use existing panel slot
-                if any(array[i, start:stop]):  # filled
-                    continue
-                array[i, start:stop] = True
-                if side in ('left', 'top'):  # descending moves us closer to 0
-                    iratio = npanels - 1 - i  # index in ratios array
-                else:  # descending array moves us closer to nacross - 1
-                    iratio = nacross - (npanels - i)  # index in ratios array
-                break
+                if not any(array[i, start:stop]):
+                    array[i, start:stop] = True
+                    if side in ('left', 'top'):  # descending moves us closer to 0
+                        iratio = npanels - 1 - i  # index in ratios array
+                    else:  # descending array moves us closer to nacross - 1
+                        iratio = nacross - (npanels - i)  # index in ratios array
+                    break
             if iratio == -1 or iratio == nacross:  # no slots so we must add to array
                 iarray = np.zeros((1, nalong), dtype=bool)
                 iarray[0, start:stop] = True