Additional tests for colors.MultiNorm

trygvrad · trygvrad · commit ce1dcfda8fe1 · 2025-01-06T13:44:27.000+01:00
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -3247,7 +3247,7 @@ def __call__(self, value, clip=None):
             clip = self.clip
         else:
             if not np.iterable(clip):
-                value = [value]*self.n_input
+                clip = [clip]*self.n_input
 
         value = self._iterable_variates_in_data(value, self.n_input)
         result = [n(v, clip=c) for n, v, c in zip(self.norms, value, clip)]
@@ -3276,8 +3276,10 @@ def autoscale(self, A):
         with self.callbacks.blocked():
             # Pause callbacks while we are updating so we only get
             # a single update signal at the end
-            self.vmin = self.vmax = None
-        self.autoscale_None(A)
+            A = self._iterable_variates_in_data(A, self.n_input)
+            for n, a in zip(self.norms, A):
+                n.autoscale(a)
+        self._changed()
 
     def autoscale_None(self, A):
         """
diff --git a/lib/matplotlib/tests/test_colors.py b/lib/matplotlib/tests/test_colors.py
@@ -1734,3 +1734,44 @@ def test_colorizer_vmin_vmax():
     assert ca.vmax == 3.0
     assert ca.norm.vmin == 1.0
     assert ca.norm.vmax == 3.0
+
+
+def test_multi_norm():
+    # tests for mcolors.MultiNorm
+
+    # test wrong input
+    with pytest.raises(ValueError,
+                       match="A MultiNorm must be assigned multiple norms"):
+        mcolors.MultiNorm("bad_norm_name")
+    with pytest.raises(ValueError,
+                       match="Invalid norm str name"):
+        mcolors.MultiNorm(["bad_norm_name"])
+
+    # test get vmin, vmax
+    norm = mpl.colors.MultiNorm(['linear', 'log'])
+    norm.vmin = 1
+    norm.vmax = 2
+    assert norm.vmin[0] == 1
+    assert norm.vmin[1] == 1
+    assert norm.vmax[0] == 2
+    assert norm.vmax[1] == 2
+
+    # test call with clip
+    assert_array_equal(norm([3, 3], clip=False), [2.0, 1.584962500721156])
+    assert_array_equal(norm([3, 3], clip=True), [1.0, 1.0])
+    assert_array_equal(norm([3, 3], clip=[True, False]), [1.0, 1.584962500721156])
+    norm.clip = False
+    assert_array_equal(norm([3, 3]), [2.0, 1.584962500721156])
+    norm.clip = True
+    assert_array_equal(norm([3, 3]), [1.0, 1.0])
+    norm.clip = [True, False]
+    assert_array_equal(norm([3, 3]), [1.0, 1.584962500721156])
+    norm.clip = True
+
+    # test inverse
+    assert_array_almost_equal(norm.inverse([0.5, 0.5849625007211562]), [1.5, 1.5])
+
+    # test autoscale
+    norm.autoscale([[0, 1, 2, 3], [0.1, 1, 2, 3]])
+    assert_array_equal(norm.vmin, [0, 0.1])
+    assert_array_equal(norm.vmax, [3, 3])
