New upstream version 0.6.1+dfsg

3 files changed, 160 insertions, 1 deletions

diff --git a/silx/gui/plot/test/__init__.py b/silx/gui/plot/test/__init__.py
index 2c2943e..07338b6 100644
--- a/silx/gui/plot/test/__init__.py
+++ b/silx/gui/plot/test/__init__.py
@@ -51,6 +51,7 @@ from . import testItem
 from . import testUtilsAxis
 from . import testLimitConstraints
 from . import testComplexImageView
+from . import testImageView
 
 
 def suite():
@@ -77,5 +78,6 @@ def suite():
          testItem.suite(),
          testUtilsAxis.suite(),
          testLimitConstraints.suite(),
-         testComplexImageView.suite()])
+         testComplexImageView.suite(),
+         testImageView.suite()])
     return test_suite
diff --git a/silx/gui/plot/test/testImageView.py b/silx/gui/plot/test/testImageView.py
new file mode 100644
index 0000000..641d438
--- /dev/null
+++ b/silx/gui/plot/test/testImageView.py
@@ -0,0 +1,136 @@
+# coding: utf-8
+# /*##########################################################################
+#
+# Copyright (c) 2017 European Synchrotron Radiation Facility
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# ###########################################################################*/
+"""Basic tests for PlotWindow"""
+
+__authors__ = ["T. Vincent"]
+__license__ = "MIT"
+__date__ = "22/09/2017"
+
+
+import unittest
+import numpy
+
+from silx.gui import qt
+from silx.gui.test.utils import TestCaseQt
+
+from silx.gui.plot import ImageView
+from silx.gui.plot.Colormap import Colormap
+
+
+class TestImageView(TestCaseQt):
+    """Tests of ImageView widget."""
+
+    def setUp(self):
+        super(TestImageView, self).setUp()
+        self.plot = ImageView()
+        self.plot.show()
+        self.qWaitForWindowExposed(self.plot)
+
+    def tearDown(self):
+        self.qapp.processEvents()
+        self.plot.setAttribute(qt.Qt.WA_DeleteOnClose)
+        self.plot.close()
+        del self.plot
+        self.qapp.processEvents()
+        super(TestImageView, self).tearDown()
+
+    def testSetImage(self):
+        """Test setImage"""
+        image = numpy.arange(100).reshape(10, 10)
+
+        self.plot.setImage(image, reset=True)
+        self.qWait(100)
+        self.assertEqual(self.plot.getXAxis().getLimits(), (0, 10))
+        self.assertEqual(self.plot.getYAxis().getLimits(), (0, 10))
+
+        # With reset=False
+        self.plot.setImage(image[::2, ::2], reset=False)
+        self.qWait(100)
+        self.assertEqual(self.plot.getXAxis().getLimits(), (0, 10))
+        self.assertEqual(self.plot.getYAxis().getLimits(), (0, 10))
+
+        self.plot.setImage(image, origin=(10, 20), scale=(2, 4), reset=False)
+        self.qWait(100)
+        self.assertEqual(self.plot.getXAxis().getLimits(), (0, 10))
+        self.assertEqual(self.plot.getYAxis().getLimits(), (0, 10))
+
+        # With reset=True
+        self.plot.setImage(image, origin=(1, 2), scale=(1, 0.5), reset=True)
+        self.qWait(100)
+        self.assertEqual(self.plot.getXAxis().getLimits(), (1, 11))
+        self.assertEqual(self.plot.getYAxis().getLimits(), (2, 7))
+
+        self.plot.setImage(image[::2, ::2], reset=True)
+        self.qWait(100)
+        self.assertEqual(self.plot.getXAxis().getLimits(), (0, 5))
+        self.assertEqual(self.plot.getYAxis().getLimits(), (0, 5))
+
+    def testColormap(self):
+        """Test get|setColormap"""
+        image = numpy.arange(100).reshape(10, 10)
+        self.plot.setImage(image)
+
+        # Colormap as dict
+        self.plot.setColormap({'name': 'viridis',
+                               'normalization': 'log',
+                               'autoscale': False,
+                               'vmin': 0,
+                               'vmax': 1})
+        colormap = self.plot.getColormap()
+        self.assertEqual(colormap.getName(), 'viridis')
+        self.assertEqual(colormap.getNormalization(), 'log')
+        self.assertEqual(colormap.getVMin(), 0)
+        self.assertEqual(colormap.getVMax(), 1)
+
+        # Colormap as keyword arguments
+        self.plot.setColormap(colormap='magma',
+                              normalization='linear',
+                              autoscale=True,
+                              vmin=1,
+                              vmax=2)
+        self.assertEqual(colormap.getName(), 'magma')
+        self.assertEqual(colormap.getNormalization(), 'linear')
+        self.assertEqual(colormap.getVMin(), None)
+        self.assertEqual(colormap.getVMax(), None)
+
+        # Update colormap with keyword argument
+        self.plot.setColormap(normalization='log')
+        self.assertEqual(colormap.getNormalization(), 'log')
+
+        # Colormap as Colormap object
+        cmap = Colormap()
+        self.plot.setColormap(cmap)
+        self.assertIs(self.plot.getColormap(), cmap)
+
+
+def suite():
+    test_suite = unittest.TestSuite()
+    test_suite.addTest(
+        unittest.defaultTestLoader.loadTestsFromTestCase(TestImageView))
+    return test_suite
+
+
+if __name__ == '__main__':
+    unittest.main(defaultTest='suite')
diff --git a/silx/gui/plot/test/testPlotWidget.py b/silx/gui/plot/test/testPlotWidget.py
index deeb198..ccee428 100644
--- a/silx/gui/plot/test/testPlotWidget.py
+++ b/silx/gui/plot/test/testPlotWidget.py
@@ -371,6 +371,27 @@ class TestPlotCurve(PlotWidgetTestCase):
                            color=color, linestyle="-", symbol='o')
         self.plot.resetZoom()
 
+        # Test updating color array
+
+        # From array to array
+        newColors = numpy.ones((len(self.xData), 3), dtype=numpy.float32)
+        self.plot.addCurve(self.xData, self.yData,
+                           legend="curve 2",
+                           replace=False, resetzoom=False,
+                           color=newColors, symbol='o')
+
+        # Array to single color
+        self.plot.addCurve(self.xData, self.yData,
+                           legend="curve 2",
+                           replace=False, resetzoom=False,
+                           color='green', symbol='o')
+
+        # single color to array
+        self.plot.addCurve(self.xData, self.yData,
+                           legend="curve 2",
+                           replace=False, resetzoom=False,
+                           color=color, symbol='o')
+
 
 class TestPlotMarker(PlotWidgetTestCase):
     """Basic tests for add*Marker"""