Make autoscale participation fully artist-driven and Remove scatter relim regression test (to be added in follow-up PR)

Author: Archiljain

lib/matplotlib/artist.py

@@ -225,7 +225,7 @@ def __init__(self):
         self._path_effects = mpl.rcParams['path.effects']
         self._sticky_edges = _XYPair([], [])
         self._in_layout = True
-        self._in_autoscale = True
+        self._in_autoscale = False
 
     def __getstate__(self):
         d = self.__dict__.copy()
@@ -904,16 +904,14 @@ def get_in_layout(self):
         """
         return self._in_layout
 
-    def get_in_autoscale(self):
+    def _get_in_autoscale(self):
         """
         Return boolean flag, ``True`` if artist is included in autoscaling
         calculations.
 
-        E.g. :ref:`autoscaling_guide` and
-        `.Axes.relim()`.
+        E.g. `.axes.Axes.autoscale_view()`.
         """
-        return self._in_autoscale
-    
+        return self._in_autoscale    
     def _fully_clipped_to_axes(self):
         """
         Return a boolean flag, ``True`` if the artist is clipped to the Axes
@@ -1143,17 +1141,16 @@ def set_in_layout(self, in_layout):
         """
         self._in_layout = in_layout
 
-    def set_in_autoscale(self, in_autoscale):
+    def _set_in_autoscale(self, b):
         """
         Set if artist is to be included in autoscaling calculations,
-        E.g. :ref:`autoscaling_guide` and
-        `.Axes.relim()`.
+        E.g. `.axes.Axes.autoscale_view()`.
 
         Parameters
         ----------
-        in_autoscale : bool
+        b : bool
         """
-        self._in_autoscale = in_autoscale
+        self._in_autoscale = b
 
     def get_label(self):
         """Return the label used for this artist in the legend."""

lib/matplotlib/axes/_base.py

@@ -2317,6 +2317,7 @@ def add_artist(self, a):
         if a.get_clip_path() is None:
             a.set_clip_path(self.patch)
         self.stale = True
+        a._set_in_autoscale(False)
         return a
 
     def add_child_axes(self, ax):
@@ -2397,6 +2398,7 @@ def add_collection(self, collection, autolim=True):
                 self._request_autoscale_view()
 
         self.stale = True
+        collection._set_in_autoscale(autolim)
         return collection
 
     def add_image(self, image):
@@ -2410,6 +2412,7 @@ def add_image(self, image):
         self._children.append(image)
         image._remove_method = self._children.remove
         self.stale = True
+        image._set_in_autoscale(True)
         return image
 
     def _update_image_limits(self, image):
@@ -2437,6 +2440,7 @@ def add_line(self, line):
         self._children.append(line)
         line._remove_method = self._children.remove
         self.stale = True
+        line._set_in_autoscale(True)
         return line
 
     def _add_text(self, txt):
@@ -2509,6 +2513,7 @@ def add_patch(self, p):
         self._update_patch_limits(p)
         self._children.append(p)
         p._remove_method = self._children.remove
+        p._set_in_autoscale(True)
         return p
 
     def _update_patch_limits(self, patch):
@@ -2606,7 +2611,7 @@ def relim(self, visible_only=False):
 
         for artist in self._children:
             if not visible_only or artist.get_visible():
-                if not artist.get_in_autoscale():
+                if not artist._get_in_autoscale():
                     continue
                 if isinstance(artist, mlines.Line2D):
                     self._update_line_limits(artist)

lib/matplotlib/tests/test_axes.py

@@ -10158,28 +10158,4 @@ def test_animated_artists_not_drawn_by_default():
         fig.draw_without_rendering()
 
     mocked_im_draw.assert_not_called()
-    mocked_ln_draw.assert_not_called()
-
-
-def test_relim_updates_scatter_offsets():
-    import numpy as np
-    import matplotlib.pyplot as plt
-
-    fig, ax = plt.subplots()
-
-    xs = np.linspace(0, 10, 100)
-    ys = np.sin(xs)
-    scatter = ax.scatter(xs, ys)
-
-    # Shift scatter upward
-    new_ys = np.sin(xs) + 5
-    scatter.set_offsets(np.column_stack((xs, new_ys)))
-
-    ax.relim()
-    ax.autoscale_view()
-
-    ymin, ymax = ax.get_ylim()
-
-    # New limits should reflect shifted data
-    assert ymin > 3
-    assert ymax > 5
+    mocked_ln_draw.assert_not_called()