Oct 24, 2024 · Aug 2, 2024 · Aug 6, 2024 · Aug 7, 2024 · Aug 9, 2024 · Aug 13, 2024
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py

 import matplotlib as mpl
 from . import _api, cbook
 from .colorizer import Colorizer
 from .path import Path
 from .transforms import (BboxBase, Bbox, IdentityTransform, Transform, TransformedBbox,
                         TransformedPatchPath, TransformedPath)
    mouseover = property(get_mouseover, set_mouseover)  # backcompat.


 class ColorizingArtist(Artist):
    def __init__(self, colorizer):
        """
        Parameters
        ----------
        colorizer : `colorizer.Colorizer`
        """
        if not isinstance(colorizer, Colorizer):
            raise ValueError("A `mpl.colorizer.Colorizer` object must be provided")

        Artist.__init__(self)

        self._A = None

        self.colorizer = colorizer
        self._id_colorizer = self.colorizer.callbacks.connect('changed', self.changed)
        self.callbacks = cbook.CallbackRegistry(signals=["changed"])

    def set_array(self, A):
        """
        Set the value array from array-like *A*.

        Parameters
        ----------
        A : array-like or None
            The values that are mapped to colors.

            The base class `.ColorizingArtist` does not make any assumptions on
            the dimensionality and shape of the value array *A*.
        """
        if A is None:
            self._A = None
            return

        A = cbook.safe_masked_invalid(A, copy=True)
        if not np.can_cast(A.dtype, float, "same_kind"):
            raise TypeError(f"Image data of dtype {A.dtype} cannot be "
                            "converted to float")

        self._A = A
        if not self.norm.scaled():
            self.colorizer.autoscale_None(A)

    def get_array(self):
        """
        Return the array of values, that are mapped to colors.

        The base class `.ColorizingArtist` does not make any assumptions on
        the dimensionality and shape of the array.
        """
        return self._A

    def changed(self):
        """
        Call this whenever the mappable is changed to notify all the
        callbackSM listeners to the 'changed' signal.
        """
        self.callbacks.process('changed')
        self.stale = True


 def _get_tightbbox_for_layout_only(obj, *args, **kwargs):
    """
    Matplotlib's `.Axes.get_tightbbox` and `.Axis.get_tightbbox` support a
diff --git a/lib/matplotlib/cm.py b/lib/matplotlib/cm.py
        return _colormaps[name].resampled(lut)


 class ScalarMappable(colorizer.ColorizerShim):
 class ScalarMappable(colorizer._ColorizerInterface):
    """
    A mixin class to map one or multiple sets of scalar data to RGBA.

diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
    "linewidth": ["linewidths", "lw"],
    "offset_transform": ["transOffset"],
 })
 class Collection(artist.ColorizingArtist,colorizer.ColorizerShim):
 class Collection(colorizer.ColorizingArtist):
    r"""
    Base class for Collections. Must be subclassed to be usable.

            ``Collection.set_{key}(val)`` for each key-value pair in *kwargs*.
        """

 artist.ColorizingArtist.__init__(self, colorizer._get_colorizer(cmap, norm))
 colorizer.ColorizingArtist.__init__(self, colorizer._get_colorizer(cmap, norm))
        # list of un-scaled dash patterns
        # this is needed scaling the dash pattern by linewidth
        self._us_linestyles = [(0, None)]
diff --git a/lib/matplotlib/colorizer.py b/lib/matplotlib/colorizer.py
 import numpy as np
 from numpy import ma
 import functools
 from matplotlib import _api, colors, cbook, scale, cm
 from matplotlib import _api, colors, cbook, scale, cm, artist


 class Colorizer():
    return Colorizer(cmap, norm)


 class ColorizerShim:
 class _ColorizerInterface:
    """
    Base class that contains the interface to `Colorizer` objects from
    a `ColorizingArtist` or `cm.ScalarMappable`.

    Note: This class only contain functions that interface the .colorizer
    attribute. Other functions that as shared between `ColorizingArtist`
    and `cm.ScalarMappable` are not included.
    """
    def _scale_norm(self, norm, vmin, vmax):
        self.colorizer._scale_norm(norm, vmin, vmax, self._A)

        # cm.ScalarMappable second, so Artist.format_cursor_data would always
        # have precedence over cm.ScalarMappable.format_cursor_data.

        # Note if cm.ScalarMappable is depreciated, this functionality should be
        # implemented as format_cursor_data() on ColorizingArtist.
        # Note if cm.ScalarMappable is depreciated, this functionality should be
        # implemented as format_cursor_data() on ColorizingArtist.
        n = self.cmap.N
        if np.ma.getmask(data):
            return "[]"
        return f"[{data:-#.{g_sig_digits}g}]"


 class ColorizingArtist(artist.Artist, _ColorizerInterface):
    def __init__(self, colorizer):
        """
        Parameters
        ----------
        colorizer : `colorizer.Colorizer`
        """
        if not isinstance(colorizer, Colorizer):
            raise ValueError("A `mpl.colorizer.Colorizer` object must be provided")

        artist.Artist.__init__(self)

        self._A = None

        self.colorizer = colorizer
        self._id_colorizer = self.colorizer.callbacks.connect('changed', self.changed)
        self.callbacks = cbook.CallbackRegistry(signals=["changed"])

    def set_array(self, A):
        """
        Set the value array from array-like *A*.

        Parameters
        ----------
        A : array-like or None
            The values that are mapped to colors.

            The base class `.ColorizingArtist` does not make any assumptions on
            the dimensionality and shape of the value array *A*.
        """
        if A is None:
            self._A = None
            return

        A = cbook.safe_masked_invalid(A, copy=True)
        if not np.can_cast(A.dtype, float, "same_kind"):
            raise TypeError(f"Image data of dtype {A.dtype} cannot be "
                            "converted to float")

        self._A = A
        if not self.norm.scaled():
            self.colorizer.autoscale_None(A)

    def get_array(self):
        """
        Return the array of values, that are mapped to colors.

        The base class `.ColorizingArtist` does not make any assumptions on
        the dimensionality and shape of the array.
        """
        return self._A

    def changed(self):
        """
        Call this whenever the mappable is changed to notify all the
        callbackSM listeners to the 'changed' signal.
        """
        self.callbacks.process('changed')
        self.stale = True


 def _auto_norm_from_scale(scale_cls):
    """
    Automatically generate a norm class from *scale_cls*.
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
    return rgba


 class _ImageBase(martist.ColorizingArtist,colorizer.ColorizerShim):
 class _ImageBase(colorizer.ColorizingArtist):
    """
    Base class for images.

                 interpolation_stage=None,
                 **kwargs
                 ):
 martist.ColorizingArtist.__init__(self, colorizer._get_colorizer(cmap, norm))
 colorizer.ColorizingArtist.__init__(self, colorizer._get_colorizer(cmap, norm))
        if origin is None:
            origin = mpl.rcParams['image.origin']
        _api.check_in_list(["upper", "lower"], origin=origin)
        Call this whenever the mappable is changed so observers can update.
        """
        self._imcache = None
 martist.ColorizingArtist.changed(self)
 colorizer.ColorizingArtist.changed(self)

    def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,
                    unsampled=False, round_to_pixel_border=True):

    def set_data(self, A):
        """Set the image array."""
 martist.ColorizingArtist.set_array(self, A)
 colorizer.ColorizingArtist.set_array(self, A)
        self.stale = True
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,7 +13,6 @@

		import matplotlib as mpl
		from . import _api, cbook
		from .colorizer import Colorizer
		from .path import Path
		from .transforms import (BboxBase, Bbox, IdentityTransform, Transform, TransformedBbox,
		TransformedPatchPath, TransformedPath)
Expand DownExpand Up		@@ -1393,67 +1392,6 @@ def set_mouseover(self, mouseover):
		mouseover = property(get_mouseover, set_mouseover) # backcompat.


		class ColorizingArtist(Artist):
		def __init__(self, colorizer):
		"""
		Parameters
		----------
		colorizer : `colorizer.Colorizer`
		"""
		if not isinstance(colorizer, Colorizer):
		raise ValueError("A `mpl.colorizer.Colorizer` object must be provided")

		Artist.__init__(self)

		self._A = None

		self.colorizer = colorizer
		self._id_colorizer = self.colorizer.callbacks.connect('changed', self.changed)
		self.callbacks = cbook.CallbackRegistry(signals=["changed"])

		def set_array(self, A):
		"""
		Set the value array from array-like A.

		Parameters
		----------
		A : array-like or None
		The values that are mapped to colors.

		The base class `.ColorizingArtist` does not make any assumptions on
		the dimensionality and shape of the value array A.
		"""
		if A is None:
		self._A = None
		return

		A = cbook.safe_masked_invalid(A, copy=True)
		if not np.can_cast(A.dtype, float, "same_kind"):
		raise TypeError(f"Image data of dtype {A.dtype} cannot be "
		"converted to float")

		self._A = A
		if not self.norm.scaled():
		self.colorizer.autoscale_None(A)

		def get_array(self):
		"""
		Return the array of values, that are mapped to colors.

		The base class `.ColorizingArtist` does not make any assumptions on
		the dimensionality and shape of the array.
		"""
		return self._A

		def changed(self):
		"""
		Call this whenever the mappable is changed to notify all the
		callbackSM listeners to the 'changed' signal.
		"""
		self.callbacks.process('changed')
		self.stale = True


		def _get_tightbbox_for_layout_only(obj, args, *kwargs):
		"""
		Matplotlib's `.Axes.get_tightbbox` and `.Axis.get_tightbbox` support a
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -281,7 +281,7 @@ def get_cmap(name=None, lut=None):
		return _colormaps[name].resampled(lut)


		class ScalarMappable(colorizer.ColorizerShim):
		class ScalarMappable(colorizer._ColorizerInterface):
		"""
		A mixin class to map one or multiple sets of scalar data to RGBA.

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,7 +33,7 @@
		"linewidth": ["linewidths", "lw"],
		"offset_transform": ["transOffset"],
		})
		class Collection(artist.ColorizingArtist,colorizer.ColorizerShim):
		class Collection(colorizer.ColorizingArtist):
		r"""
		Base class for Collections. Must be subclassed to be usable.

Expand DownExpand Up		@@ -157,7 +157,7 @@ def __init__(self, *,
		``Collection.set_{key}(val)`` for each key-value pair in kwargs.
		"""

		artist.ColorizingArtist.__init__(self, colorizer._get_colorizer(cmap, norm))
		colorizer.ColorizingArtist.__init__(self, colorizer._get_colorizer(cmap, norm))
		# list of un-scaled dash patterns
		# this is needed scaling the dash pattern by linewidth
		self._us_linestyles = [(0, None)]
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -229,7 +229,7 @@ def _rgb_to_rgba(A):
		return rgba


		class _ImageBase(martist.ColorizingArtist,colorizer.ColorizerShim):
		class _ImageBase(colorizer.ColorizingArtist):
		"""
		Base class for images.

Expand DownExpand Up		@@ -258,7 +258,7 @@ def __init__(self, ax,
		interpolation_stage=None,
		**kwargs
		):
		martist.ColorizingArtist.__init__(self, colorizer._get_colorizer(cmap, norm))
		colorizer.ColorizingArtist.__init__(self, colorizer._get_colorizer(cmap, norm))
		if origin is None:
		origin = mpl.rcParams['image.origin']
		_api.check_in_list(["upper", "lower"], origin=origin)
Expand DownExpand Up		@@ -330,7 +330,7 @@ def changed(self):
		Call this whenever the mappable is changed so observers can update.
		"""
		self._imcache = None
		martist.ColorizingArtist.changed(self)
		colorizer.ColorizingArtist.changed(self)

		def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,
		unsampled=False, round_to_pixel_border=True):
Expand DownExpand Up		@@ -1349,7 +1349,7 @@ def make_image(self, renderer, magnification=1.0, unsampled=False):

		def set_data(self, A):
		"""Set the image array."""
		martist.ColorizingArtist.set_array(self, A)
		colorizer.ColorizingArtist.set_array(self, A)
		self.stale = True


Expand Down