Merge pull request #21400 from anntzer/bboxprops

timhoffm · web-flow · commit fea21afc6949 · 2021-10-21T08:48:34.000+02:00
Use bbox.{size,bounds,width,height,p0,...} where appropriate.
diff --git a/examples/shapes_and_collections/fancybox_demo.py b/examples/shapes_and_collections/fancybox_demo.py
@@ -44,7 +44,7 @@
 
 
 def add_fancy_patch_around(ax, bb, **kwargs):
-    fancy = FancyBboxPatch((bb.xmin, bb.ymin), bb.width, bb.height,
+    fancy = FancyBboxPatch(bb.p0, bb.width, bb.height,
                            fc=(1, 0.8, 1, 0.5), ec=(1, 0.5, 1, 0.5),
                            **kwargs)
     ax.add_patch(fancy)
diff --git a/lib/matplotlib/backends/backend_wxcairo.py b/lib/matplotlib/backends/backend_wxcairo.py
@@ -30,11 +30,10 @@ def __init__(self, parent, id, figure):
         self._renderer = RendererCairo(self.figure.dpi)
 
     def draw(self, drawDC=None):
-        width = int(self.figure.bbox.width)
-        height = int(self.figure.bbox.height)
-        surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height)
+        size = self.figure.bbox.size.astype(int)
+        surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, *size)
         self._renderer.set_ctx_from_surface(surface)
-        self._renderer.set_width_height(width, height)
+        self._renderer.set_width_height(*size)
         self._renderer.dpi = self.figure.dpi
         self.figure.draw(self._renderer)
         self.bitmap = wxcairo.BitmapFromImageSurface(surface)
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -1627,7 +1627,7 @@ def get_tightbbox(self, renderer, bbox_extra_artists=None):
 
         for a in artists:
             bbox = a.get_tightbbox(renderer)
-            if bbox is not None and (bbox.width != 0 or bbox.height != 0):
+            if bbox is not None:
                 bb.append(bbox)
 
         for ax in self.axes:
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
@@ -621,7 +621,7 @@ def draw(self, renderer):
         # update the location and size of the legend. This needs to
         # be done in any case to clip the figure right.
         bbox = self._legend_box.get_window_extent(renderer)
-        self.legendPatch.set_bounds(bbox.x0, bbox.y0, bbox.width, bbox.height)
+        self.legendPatch.set_bounds(bbox.bounds)
         self.legendPatch.set_mutation_scale(fontsize)
 
         if self.shadow:
diff --git a/lib/matplotlib/offsetbox.py b/lib/matplotlib/offsetbox.py
@@ -557,7 +557,7 @@ def draw(self, renderer):
         self.stale = False
 
     def update_frame(self, bbox, fontsize=None):
-        self.patch.set_bounds(bbox.x0, bbox.y0, bbox.width, bbox.height)
+        self.patch.set_bounds(bbox.bounds)
         if fontsize:
             self.patch.set_mutation_scale(fontsize)
         self.stale = True
@@ -811,7 +811,7 @@ def get_extent(self, renderer):
             ismath="TeX" if self._text.get_usetex() else False)
 
         bbox, info, yd = self._text._get_layout(renderer)
-        w, h = bbox.width, bbox.height
+        w, h = bbox.size
 
         self._baseline_transform.clear()
 
@@ -1111,7 +1111,7 @@ def _offset(w, h, xd, yd, renderer):
         self.set_offset(_offset)
 
     def update_frame(self, bbox, fontsize=None):
-        self.patch.set_bounds(bbox.x0, bbox.y0, bbox.width, bbox.height)
+        self.patch.set_bounds(bbox.bounds)
         if fontsize:
             self.patch.set_mutation_scale(fontsize)
 
@@ -1146,8 +1146,7 @@ def _get_anchored_bbox(loc, bbox, parentbbox, borderpad):
     # validated.  If 0 (None), we just let ``bbox.anchored`` raise.
     c = [None, "NE", "NW", "SW", "SE", "E", "W", "E", "S", "N", "C"][loc]
     container = parentbbox.padded(-borderpad)
-    anchored_box = bbox.anchored(c, container=container)
-    return anchored_box.x0, anchored_box.y0
+    return bbox.anchored(c, container=container).p0
 
 
 class AnchoredText(AnchoredOffsetbox):
@@ -1487,8 +1486,7 @@ def _update_position_xybox(self, renderer, xy_pixel):
 
         # update patch position
         bbox = self.offsetbox.get_window_extent(renderer)
-        self.patch.set_bounds(bbox.x0, bbox.y0,
-                              bbox.width, bbox.height)
+        self.patch.set_bounds(bbox.bounds)
 
         x, y = xy_pixel
 
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -2106,7 +2106,7 @@ def draw_bbox(bbox, renderer, color='k', trans=None):
     box returned by an artist's `.Artist.get_window_extent`
     to test whether the artist is returning the correct bbox.
     """
-    r = Rectangle(xy=(bbox.x0, bbox.y0), width=bbox.width, height=bbox.height,
+    r = Rectangle(xy=bbox.p0, width=bbox.width, height=bbox.height,
                   edgecolor=color, fill=False, clip_on=False)
     if trans is not None:
         r.set_transform(trans)
diff --git a/lib/matplotlib/quiver.py b/lib/matplotlib/quiver.py
@@ -605,13 +605,9 @@ def _dots_per_unit(self, units):
             elif units == 'y':
                 dx0 = self.axes.viewLim.height
                 dx1 = self.axes.bbox.height
-            else:  # 'xy' is assumed
-                dxx0 = self.axes.viewLim.width
-                dxx1 = self.axes.bbox.width
-                dyy0 = self.axes.viewLim.height
-                dyy1 = self.axes.bbox.height
-                dx1 = np.hypot(dxx1, dyy1)
-                dx0 = np.hypot(dxx0, dyy0)
+            else:  # 'xy', i.e. hypot(x, y)
+                dx0 = np.hypot(*self.axes.viewLim.size)
+                dx1 = np.hypot(*self.axes.bbox.size)
             dx = dx1 / dx0
         else:
             if units == 'width':
diff --git a/lib/matplotlib/tight_bbox.py b/lib/matplotlib/tight_bbox.py
@@ -57,10 +57,9 @@ def restore_bbox():
     tr = Affine2D().scale(fixed_dpi)
     dpi_scale = fixed_dpi / fig.dpi
 
-    fig.bbox_inches = Bbox.from_bounds(0, 0,
-                                       bbox_inches.width, bbox_inches.height)
+    fig.bbox_inches = Bbox.from_bounds(0, 0, *bbox_inches.size)
     x0, y0 = tr.transform(bbox_inches.p0)
-    w1, h1 = fig.bbox.width * dpi_scale, fig.bbox.height * dpi_scale
+    w1, h1 = fig.bbox.size * dpi_scale
     fig.transFigure._boxout = Bbox.from_bounds(-x0, -y0, w1, h1)
     fig.transFigure.invalidate()
 
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
@@ -1207,12 +1207,12 @@ def _rendercursor(self):
         bb_widthtext = self.text_disp.get_window_extent()
 
         if bb_text.y0 == bb_text.y1:  # Restoring the height if no text.
-            bb_text.y0 -= (bb_widthtext.y1-bb_widthtext.y0)/2
-            bb_text.y1 += (bb_widthtext.y1-bb_widthtext.y0)/2
+            bb_text.y0 -= bb_widthtext.height / 2
+            bb_text.y1 += bb_widthtext.height / 2
         elif not widthtext:  # Keep width to 0.
             bb_text.x1 = bb_text.x0
         else:  # Move the cursor using width of bb_widthtext.
-            bb_text.x1 = bb_text.x0 + (bb_widthtext.x1 - bb_widthtext.x0)
+            bb_text.x1 = bb_text.x0 + bb_widthtext.width
 
         self.cursor.set(
             segments=[[(bb_text.x1, bb_text.y0), (bb_text.x1, bb_text.y1)]],
diff --git a/lib/mpl_toolkits/axes_grid1/axes_divider.py b/lib/mpl_toolkits/axes_grid1/axes_divider.py
@@ -205,8 +205,7 @@ def locate(self, nx, ny, nx1=None, ny1=None, axes=None, renderer=None):
             hh = (oy[-1] - oy[0]) / fig_h
             pb = mtransforms.Bbox.from_bounds(x, y, w, h)
             pb1 = mtransforms.Bbox.from_bounds(x, y, ww, hh)
-            pb1_anchored = pb1.anchored(self.get_anchor(), pb)
-            x0, y0 = pb1_anchored.x0, pb1_anchored.y0
+            x0, y0 = pb1.anchored(self.get_anchor(), pb).p0
 
         else:
             ox = self._calc_offsets(hsizes, k_h)
@@ -637,8 +636,7 @@ def _locate(x, y, w, h, summed_widths, equal_heights, fig_w, fig_h, anchor):
     hh = (karray[0]*h0_r + h0_a) / fig_h
     pb = mtransforms.Bbox.from_bounds(x, y, w, h)
     pb1 = mtransforms.Bbox.from_bounds(x, y, ww, hh)
-    pb1_anchored = pb1.anchored(anchor, pb)
-    x0, y0 = pb1_anchored.x0, pb1_anchored.y0
+    x0, y0 = pb1.anchored(anchor, pb).p0
 
     return x0, y0, ox, hh
 
