New upstream version 0.11.0+dfsg

5 files changed, 22 insertions, 337 deletions

diff --git a/silx/sx/__init__.py b/silx/sx/__init__.py
index e3641c8..97a3460 100644
--- a/silx/sx/__init__.py
+++ b/silx/sx/__init__.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 # /*##########################################################################
 #
-# Copyright (c) 2016-2018 European Synchrotron Radiation Facility
+# Copyright (c) 2016-2019 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
@@ -75,6 +75,10 @@ else:
     _IS_NOTEBOOK = False
 
 
+# Placeholder for QApplication
+_qapp = None
+
+
 def enable_gui():
     """Populate silx.sx module with silx.gui features and initialise Qt"""
     if _NO_DISPLAY:  # Missing DISPLAY under linux
@@ -82,18 +86,21 @@ def enable_gui():
             'Not loading silx.gui features: No DISPLAY available')
         return
 
-    global qt, qapp
+    global qt, _qapp
 
     if _IS_NOTEBOOK:
         _get_ipython().enable_pylab(gui='qt', import_all=False)
 
     from silx.gui import qt
-    qapp = qt.QApplication.instance() or qt.QApplication([])
+    # Create QApplication and keep reference only if needed
+    if not qt.QApplication.instance():
+        _qapp = qt.QApplication([])
 
     if hasattr(_sys, 'ps1'):  # If from console, change windows icon
         # Change windows default icon
         from silx.gui import icons
-        qapp.setWindowIcon(icons.getQIcon('silx'))
+        app = qt.QApplication.instance()
+        app.setWindowIcon(icons.getQIcon('silx'))
 
     global ImageView, PlotWidget, PlotWindow, Plot1D
     global Plot2D, StackView, ScatterView, TickMode
diff --git a/silx/sx/_plot.py b/silx/sx/_plot.py
index 00dcabe..1da44ab 100644
--- a/silx/sx/_plot.py
+++ b/silx/sx/_plot.py
@@ -31,6 +31,10 @@ __date__ = "06/11/2018"
 
 
 import collections
+try:
+    from collections import abc
+except ImportError:  # Python2 support
+    import collections as abc
 import logging
 import weakref
 
@@ -362,7 +366,7 @@ def scatter(x=None, y=None, value=None, size=None,
         if value is None:
             value = numpy.ones(len(x), dtype=numpy.float32)
 
-        elif isinstance(value, collections.Iterable):
+        elif isinstance(value, abc.Iterable):
             value = numpy.array(value, copy=True).reshape(-1)
             assert len(x) == len(value)
 
@@ -400,7 +404,7 @@ class _GInputResult(tuple):
     def __init__(self, position, item, indices, data):
         self._itemRef = weakref.ref(item) if item is not None else None
         self._indices = numpy.array(indices, copy=True)
-        if isinstance(data, collections.Iterable):
+        if isinstance(data, abc.Iterable):
             self._data = numpy.array(data, copy=True)
         else:
             self._data = data
diff --git a/silx/sx/_plot3d.py b/silx/sx/_plot3d.py
index da4bad4..444d9e0 100644
--- a/silx/sx/_plot3d.py
+++ b/silx/sx/_plot3d.py
@@ -30,7 +30,10 @@ __license__ = "MIT"
 __date__ = "24/04/2018"
 
 
-from collections import Iterable
+try:
+    from collections import abc
+except ImportError:  # Python2 support
+    import collections as abc
 import logging
 import numpy
 
@@ -111,7 +114,7 @@ def contour3d(scalars,
     elif isinstance(contours, float):
         contours = [contours]
 
-    assert isinstance(contours, Iterable)
+    assert isinstance(contours, abc.Iterable)
 
     # Prepare colors
     if color is not None:
diff --git a/silx/sx/test/__init__.py b/silx/sx/test/__init__.py
deleted file mode 100644
index c9401b6..0000000
--- a/silx/sx/test/__init__.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# coding: utf-8
-# /*##########################################################################
-# Copyright (C) 2018 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.
-#
-# ############################################################################*/
-
-__authors__ = ["T. Vincent"]
-__license__ = "MIT"
-__date__ = "06/03/2018"
-
-import unittest
-
-
-from . import test_sx
-
-
-def suite():
-    test_suite = unittest.TestSuite()
-    test_suite.addTest(test_sx.suite())
-    return test_suite
diff --git a/silx/sx/test/test_sx.py b/silx/sx/test/test_sx.py
deleted file mode 100644
index ec95838..0000000
--- a/silx/sx/test/test_sx.py
+++ /dev/null
@@ -1,291 +0,0 @@
-# coding: utf-8
-# /*##########################################################################
-#
-# Copyright (c) 2016-2018 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.
-#
-# ###########################################################################*/
-__authors__ = ["T. Vincent", "P. Knobel"]
-__license__ = "MIT"
-__date__ = "06/11/2018"
-
-
-import logging
-import unittest
-import numpy
-
-from silx.utils.testutils import ParametricTestCase
-from silx.test.utils import test_options
-
-from silx.gui import qt
-# load TestCaseQt before sx
-from silx.gui.utils.testutils import TestCaseQt
-from silx.gui.colors import rgba
-from silx.gui.colors import Colormap
-from silx import sx
-
-try:
-    import OpenGL
-except ImportError:
-    has_opengl = False
-else:
-    has_opengl = True
-
-
-_logger = logging.getLogger(__name__)
-
-
-class SXTest(TestCaseQt, ParametricTestCase):
-    """Test the sx module"""
-
-    def _expose_and_close(self, plot):
-        self.qWaitForWindowExposed(plot)
-        self.qapp.processEvents()
-        plot.setAttribute(qt.Qt.WA_DeleteOnClose)
-        plot.close()
-
-    def test_plot(self):
-        """Test plot function"""
-        y = numpy.random.random(100)
-        x = numpy.arange(len(y)) * 0.5
-
-        # Nothing
-        plt = sx.plot()
-        self._expose_and_close(plt)
-
-        # y
-        plt = sx.plot(y, title='y')
-        self._expose_and_close(plt)
-
-        # y, style
-        plt = sx.plot(y, 'blued ', title='y, "blued "')
-        self._expose_and_close(plt)
-
-        # x, y
-        plt = sx.plot(x, y, title='x, y')
-        self._expose_and_close(plt)
-
-        # x, y, style
-        plt = sx.plot(x, y, 'ro-', xlabel='x', title='x, y, "ro-"')
-        self._expose_and_close(plt)
-
-        # x, y, style, y
-        plt = sx.plot(x, y, 'ro-', y ** 2, xlabel='x', ylabel='y',
-                      title='x, y, "ro-", y ** 2')
-        self._expose_and_close(plt)
-
-        # x, y, style, y, style
-        plt = sx.plot(x, y, 'ro-', y ** 2, 'b--',
-                      title='x, y, "ro-", y ** 2, "b--"')
-        self._expose_and_close(plt)
-
-        # x, y, style, x, y, style
-        plt = sx.plot(x, y, 'ro-', x, y ** 2, 'b--',
-                      title='x, y, "ro-", x, y ** 2, "b--"')
-        self._expose_and_close(plt)
-
-        # x, y, x, y
-        plt = sx.plot(x, y, x, y ** 2, title='x, y, x, y ** 2')
-        self._expose_and_close(plt)
-
-    def test_imshow(self):
-        """Test imshow function"""
-        img = numpy.arange(100.).reshape(10, 10) + 1
-
-        # Nothing
-        plt = sx.imshow()
-        self._expose_and_close(plt)
-
-        # image
-        plt = sx.imshow(img)
-        self._expose_and_close(plt)
-
-        # image, named cmap
-        plt = sx.imshow(img, cmap='jet', title='jet cmap')
-        self._expose_and_close(plt)
-
-        # image, custom colormap
-        plt = sx.imshow(img, cmap=Colormap(), title='custom colormap')
-        self._expose_and_close(plt)
-
-        # image, log cmap
-        plt = sx.imshow(img, norm='log', title='log cmap')
-        self._expose_and_close(plt)
-
-        # image, fixed range
-        plt = sx.imshow(img, vmin=10, vmax=20,
-                        title='[10,20] cmap')
-        self._expose_and_close(plt)
-
-        # image, keep ratio
-        plt = sx.imshow(img, aspect=True,
-                        title='keep ratio')
-        self._expose_and_close(plt)
-
-        # image, change origin and scale
-        plt = sx.imshow(img, origin=(10, 10), scale=(2, 2),
-                        title='origin=(10, 10), scale=(2, 2)')
-        self._expose_and_close(plt)
-
-        # image, origin='lower'
-        plt = sx.imshow(img, origin='upper', title='origin="lower"')
-        self._expose_and_close(plt)
-
-    def test_scatter(self):
-        """Test scatter function"""
-        x = numpy.arange(100)
-        y = numpy.arange(100)
-        values = numpy.arange(100)
-
-        # simple scatter
-        plt = sx.scatter(x, y, values)
-        self._expose_and_close(plt)
-
-        # No value
-        plt = sx.scatter(x, y, values)
-        self._expose_and_close(plt)
-
-        # single value
-        plt = sx.scatter(x, y, 10.)
-        self._expose_and_close(plt)
-
-        # set size
-        plt = sx.scatter(x, y, values, size=20)
-        self._expose_and_close(plt)
-
-        # set colormap
-        plt = sx.scatter(x, y, values, cmap='jet')
-        self._expose_and_close(plt)
-
-        # set colormap range
-        plt = sx.scatter(x, y, values, vmin=2, vmax=50)
-        self._expose_and_close(plt)
-
-        # set colormap normalisation
-        plt = sx.scatter(x, y, values, norm='log')
-        self._expose_and_close(plt)
-
-    def test_ginput(self):
-        """Test ginput function
-
-        This does NOT perform interactive tests
-        """
-
-        for create_plot in (sx.plot, sx.imshow, sx.scatter):
-            with self.subTest(create_plot.__name__):
-                plt = create_plot()
-                self.qWaitForWindowExposed(plt)
-                self.qapp.processEvents()
-
-                result = sx.ginput(1, timeout=0.1)
-                self.assertEqual(len(result), 0)
-
-                plt.setAttribute(qt.Qt.WA_DeleteOnClose)
-                plt.close()
-
-    @unittest.skipUnless(has_opengl, 'OpenGL not installed')
-    @unittest.skipUnless(test_options.WITH_GL_TEST,
-                         test_options.WITH_GL_TEST_REASON)
-    def test_contour3d(self):
-        """Test contour3d function"""
-        coords = numpy.linspace(-10, 10, 64)
-        z = coords.reshape(-1, 1, 1)
-        y = coords.reshape(1, -1, 1)
-        x = coords.reshape(1, 1, -1)
-        data = numpy.sin(x * y * z) / (x * y * z)
-
-        # Just data
-        window = sx.contour3d(data)
-
-        isosurfaces = window.getIsosurfaces()
-        self.assertEqual(len(isosurfaces), 1)
-
-        if not window.getPlot3DWidget().isValid():
-            self.skipTest("OpenGL context is not valid")
-
-        # N contours + color
-        colors = ['red', 'green', 'blue']
-        window = sx.contour3d(data, copy=False, contours=len(colors),
-                              color=colors)
-
-        isosurfaces = window.getIsosurfaces()
-        self.assertEqual(len(isosurfaces), len(colors))
-        for iso, color in zip(isosurfaces, colors):
-            self.assertEqual(rgba(iso.getColor()), rgba(color))
-
-        # by isolevel, single color
-        contours = 0.2, 0.5
-        window = sx.contour3d(data, copy=False, contours=contours,
-                              color='yellow')
-
-        isosurfaces = window.getIsosurfaces()
-        self.assertEqual(len(isosurfaces), len(contours))
-        for iso, level in zip(isosurfaces, contours):
-            self.assertEqual(iso.getLevel(), level)
-            self.assertEqual(rgba(iso.getColor()),
-                             rgba('yellow'))
-
-        # Single isolevel, colormap
-        window = sx.contour3d(data, copy=False, contours=0.5,
-                              colormap='gray', vmin=0.6, opacity=0.4)
-
-        isosurfaces = window.getIsosurfaces()
-        self.assertEqual(len(isosurfaces), 1)
-        self.assertEqual(isosurfaces[0].getLevel(), 0.5)
-        self.assertEqual(rgba(isosurfaces[0].getColor()),
-                         (0., 0., 0., 0.4))
-
-    @unittest.skipUnless(has_opengl, 'OpenGL not installed')
-    @unittest.skipUnless(test_options.WITH_GL_TEST,
-                         test_options.WITH_GL_TEST_REASON)
-    def test_points3d(self):
-        """Test points3d function"""
-        x = numpy.random.random(1024)
-        y = numpy.random.random(1024)
-        z = numpy.random.random(1024)
-        values = numpy.random.random(1024)
-
-        # 3D positions, no value
-        window = sx.points3d(x, y, z)
-
-        if not window.getSceneWidget().isValid():
-            self.skipTest("OpenGL context is not valid")
-
-        # 3D positions, values
-        window = sx.points3d(x, y, z, values, mode='2dsquare',
-                             colormap='magma', vmin=0.4, vmax=0.5)
-
-        # 2D positions, no value
-        window = sx.points3d(x, y)
-
-        # 2D positions, values
-        window = sx.points3d(x, y, values=values, mode=',',
-                             colormap='magma', vmin=0.4, vmax=0.5)
-
-
-def suite():
-    test_suite = unittest.TestSuite()
-    test_suite.addTest(
-        unittest.defaultTestLoader.loadTestsFromTestCase(SXTest))
-    return test_suite
-
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='suite')