From 613eb75494b148cef222db49ac75c6204a5f187c Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Mon, 21 Sep 2015 11:52:18 +0100 Subject: [PATCH 1/4] Add a regression test for set_cmap in NonUniformImage --- lib/matplotlib/tests/test_image.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py index 2a9fa4152d5e..fafcec748f4f 100644 --- a/lib/matplotlib/tests/test_image.py +++ b/lib/matplotlib/tests/test_image.py @@ -6,7 +6,7 @@ import numpy as np from matplotlib.testing.decorators import image_comparison, knownfailureif, cleanup -from matplotlib.image import BboxImage, imread +from matplotlib.image import BboxImage, imread, NonUniformImage from matplotlib.transforms import Bbox from matplotlib import rcParams import matplotlib.pyplot as plt @@ -441,6 +441,11 @@ def test_zoom_and_clip_upper_origin(): ax.set_xlim(-0.5, 2.0) +def test_nonuniformimage_setcmap(): + ax = plt.gca() + im = NonUniformImage(ax) + im.set_cmap('Blues') + if __name__=='__main__': import nose nose.runmodule(argv=['-s','--with-doctest'], exit=False) From bb855900e7aa615402d0399958b15347e8164ff1 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Mon, 21 Sep 2015 11:53:03 +0100 Subject: [PATCH 2/4] Add fix for set_cmap in NonUniformImage --- lib/matplotlib/image.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py index e1d20c88c27f..e8616c010bd6 100644 --- a/lib/matplotlib/image.py +++ b/lib/matplotlib/image.py @@ -852,7 +852,7 @@ def set_norm(self, norm): def set_cmap(self, cmap): if self._A is not None: raise RuntimeError('Cannot change colors after loading data') - super(NonUniformImage, self).set_cmap(self, cmap) + super(NonUniformImage, self).set_cmap(cmap) class PcolorImage(martist.Artist, cm.ScalarMappable): From d0612fbc5a84d8f48b12839c418555870eded4f4 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Mon, 21 Sep 2015 15:36:28 +0100 Subject: [PATCH 3/4] add regression test for set_norm --- lib/matplotlib/tests/test_image.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py index fafcec748f4f..6f69822b535d 100644 --- a/lib/matplotlib/tests/test_image.py +++ b/lib/matplotlib/tests/test_image.py @@ -441,11 +441,18 @@ def test_zoom_and_clip_upper_origin(): ax.set_xlim(-0.5, 2.0) +@cleanup def test_nonuniformimage_setcmap(): ax = plt.gca() im = NonUniformImage(ax) im.set_cmap('Blues') +@cleanup +def test_nonuniformimage_setnorm(): + ax = plt.gca() + im = NonUniformImage(ax) + im.set_norm(plt.Normalize()) + if __name__=='__main__': import nose nose.runmodule(argv=['-s','--with-doctest'], exit=False) From ad2d4cb0315da1bfb546feae154afa8247ec90b1 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Mon, 21 Sep 2015 15:37:22 +0100 Subject: [PATCH 4/4] fix set_norm bug in NonUniformImage --- lib/matplotlib/image.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py index e8616c010bd6..5447cf6a74de 100644 --- a/lib/matplotlib/image.py +++ b/lib/matplotlib/image.py @@ -847,7 +847,7 @@ def set_filterrad(self, s): def set_norm(self, norm): if self._A is not None: raise RuntimeError('Cannot change colors after loading data') - super(NonUniformImage, self).set_norm(self, norm) + super(NonUniformImage, self).set_norm(norm) def set_cmap(self, cmap): if self._A is not None: