Use rectangle coords instead of width/height

dstansby · dstansby · commit 5a4d09d5f495 · 2017-08-24T13:30:13.000+01:00
Fix up some incorrect bits in Rectangle

Remember to update x1/y1 when setting x0/y0

Add methods to update x1/y1
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -669,7 +669,7 @@ class Rectangle(Patch):
     """
 
     def __str__(self):
-        pars = self._x, self._y, self._width, self._height, self.angle
+        pars = self._x0, self._y0, self._width, self._height, self.angle
         fmt = "Rectangle(xy=(%g, %g), width=%g, height=%g, angle=%g)"
         return fmt % pars
 
@@ -688,10 +688,15 @@ def __init__(self, xy, width, height, angle=0.0, **kwargs):
 
         Patch.__init__(self, **kwargs)
 
-        self._x = xy[0]
-        self._y = xy[1]
+        self._x0 = xy[0]
+        self._y0 = xy[1]
+
         self._width = width
         self._height = height
+
+        self._x1 = self._x0 + self._width
+        self._y1 = self._y0 + self._height
+
         self.angle = float(angle)
         # Note: This cannot be calculated until this is added to an Axes
         self._rect_transform = transforms.IdentityTransform()
@@ -708,31 +713,37 @@ def _update_patch_transform(self):
                  maxes it very important to call the accessor method and
                  not directly access the transformation member variable.
         """
-        x = self.convert_xunits(self._x)
-        y = self.convert_yunits(self._y)
-        width = self.convert_xunits(self._width)
-        height = self.convert_yunits(self._height)
-        bbox = transforms.Bbox.from_bounds(x, y, width, height)
+        x0 = self.convert_xunits(self._x0)
+        y0 = self.convert_yunits(self._y0)
+        x1 = self.convert_xunits(self._x1)
+        y1 = self.convert_yunits(self._y1)
+        bbox = transforms.Bbox.from_extents(x0, y0, x1, y1)
         rot_trans = transforms.Affine2D()
-        rot_trans.rotate_deg_around(x, y, self.angle)
+        rot_trans.rotate_deg_around(x0, y0, self.angle)
         self._rect_transform = transforms.BboxTransformTo(bbox)
         self._rect_transform += rot_trans
 
+    def _update_x1(self):
+        self._x1 = self._x0 + self._width
+
+    def _update_y1(self):
+        self._y1 = self._y0 + self._height
+
     def get_patch_transform(self):
         self._update_patch_transform()
         return self._rect_transform
 
     def get_x(self):
         "Return the left coord of the rectangle"
-        return self._x
+        return self._x0
 
     def get_y(self):
         "Return the bottom coord of the rectangle"
-        return self._y
+        return self._y0
 
     def get_xy(self):
         "Return the left and bottom coords of the rectangle"
-        return self._x, self._y
+        return self._x0, self._y0
 
     def get_width(self):
         "Return the width of the  rectangle"
@@ -748,7 +759,8 @@ def set_x(self, x):
 
         ACCEPTS: float
         """
-        self._x = x
+        self._x0 = x
+        self._update_x1()
         self.stale = True
 
     def set_y(self, y):
@@ -757,7 +769,8 @@ def set_y(self, y):
 
         ACCEPTS: float
         """
-        self._y = y
+        self._y0 = y
+        self._update_y1()
         self.stale = True
 
     def set_xy(self, xy):
@@ -766,7 +779,9 @@ def set_xy(self, xy):
 
         ACCEPTS: 2-item sequence
         """
-        self._x, self._y = xy
+        self._x0, self._y0 = xy
+        self._update_x1()
+        self._update_y1()
         self.stale = True
 
     def set_width(self, w):
@@ -776,6 +791,7 @@ def set_width(self, w):
         ACCEPTS: float
         """
         self._width = w
+        self._update_x1()
         self.stale = True
 
     def set_height(self, h):
@@ -785,6 +801,7 @@ def set_height(self, h):
         ACCEPTS: float
         """
         self._height = h
+        self._update_y1()
         self.stale = True
 
     def set_bounds(self, *args):
@@ -797,15 +814,17 @@ def set_bounds(self, *args):
             l, b, w, h = args[0]
         else:
             l, b, w, h = args
-        self._x = l
-        self._y = b
+        self._x0 = l
+        self._y0 = b
         self._width = w
         self._height = h
+        self._update_x1()
+        self._update_y1()
         self.stale = True
 
     def get_bbox(self):
-        return transforms.Bbox.from_bounds(self._x, self._y,
-                                           self._width, self._height)
+        return transforms.Bbox.from_extents(self._x0, self._y0,
+                                            self._x1, self._y1)
 
     xy = property(get_xy, set_xy)
 
