BUGFIX: Line2D.get_window_extents more accurate

brunobeltran · brunobeltran · commit 812f93845af9 · 2020-04-20T08:06:13.000-07:00
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -613,15 +613,46 @@ def set_picker(self, p):
         self._picker = p
 
     def get_window_extent(self, renderer):
-        bbox = Bbox([[0, 0], [0, 0]])
-        trans_data_to_xy = self.get_transform().transform
-        bbox.update_from_data_xy(trans_data_to_xy(self.get_xydata()),
-                                 ignore=True)
-        # correct for marker size, if any
+        """
+        Get bbox of Line2D in pixel space.
+
+        Notes
+        -----
+        Both the (stroked) line itself or any markers that have been placed
+        every ``markevery`` vertices along the line could be responsible for a
+        `Line2D`'s extents.
+        """
+        # marker contribution
         if self._marker:
-            ms = (self._markersize / 72.0 * self.figure.dpi) * 0.5
-            bbox = bbox.padded(ms)
-        return bbox
+            pts_box = self._marker.get_drawn_bbox(
+                self._markersize, self._markeredgewidth)
+            pix_box = pts_box.transformed(
+                Affine2D().scale(self.figure.dpi / 72.0))
+        else:
+            pix_box = Bbox([[0, 0], [0, 0]])
+        marker_bbox = Bbox.null()
+        trans_data_to_xy = self.get_transform().transform
+        xy = trans_data_to_xy(self.get_xydata())
+        if self._markevery:
+            xy = xy[::self._markevery]
+        bottom_left = xy + np.array([pix_box.x0, pix_box.y0])
+        marker_bbox.update_from_data_xy(bottom_left, ignore=True)
+        top_right = xy + np.array([pix_box.x1, pix_box.y1])
+        marker_bbox.update_from_data_xy(top_right, ignore=False)
+
+        # line's contribution
+        if self.is_dashed():
+            cap = self._dashcapstyle
+            join = self._dashjoinstyle
+        else:
+            cap = self._solidcapstyle
+            join = self._solidjoinstyle
+        line_bbox = Bbox.null()
+        path, affine = (self._get_transformed_path()
+                        .get_transformed_path_and_affine())
+        lw = self.get_linewidth() / 72.0 * self.figure.dpi
+        path_bbox = path.get_stroked_extents(lw, affine, join, cap)
+        return Bbox.union([path_bbox, marker_bbox])
 
     @Artist.axes.setter
     def axes(self, ax):
diff --git a/lib/matplotlib/markers.py b/lib/matplotlib/markers.py
@@ -132,7 +132,7 @@
 
 from . import cbook, rcParams
 from .path import Path
-from .transforms import IdentityTransform, Affine2D
+from .transforms import IdentityTransform, Affine2D, Bbox
 
 # special-purpose marker identifiers:
 (TICKLEFT, TICKRIGHT, TICKUP, TICKDOWN,
@@ -869,3 +869,29 @@ def _set_x_filled(self):
             self._alt_transform = Affine2D().translate(-0.5, -0.5)
             self._transform.rotate_deg(rotate)
             self._alt_transform.rotate_deg(rotate_alt)
+
+    def get_drawn_bbox(self, markersize, markeredgewidth, **kwargs):
+        """
+        Get size of bbox of marker directly from its path.
+
+        Parameters
+        ----------
+        markersize : float
+            "Size" of the marker, in points.
+        markeredgewidth : float, optional, default: 0
+            Width, in points, of the stroke used to create the marker's edge.
+        **kwargs
+            Forwarded to `~.path.Path.iter_angles`.
+
+        Returns
+        -------
+        bbox : matplotlib.transforms.Bbox
+            The extents of the marker including its edge (in points) if it were
+            centered at (0,0).
+        """
+        if np.isclose(markersize, 0):
+            return Bbox([[0, 0], [0, 0]])
+        scale = Affine2D().scale(markersize)
+        transform = scale + self._transform
+        return self._path.get_stroked_extents(markeredgewidth, transform,
+                                              self._joinstyle, self._capstyle)
