Merge 2c2ff5a into 51ab675

scikit-image · Dec 30, 2014 · b2258d6 · b2258d6
2 parents 51ab675 + 2c2ff5a
commit b2258d6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/skimage/viewer/qt.py b/skimage/viewer/qt.py
@@ -2,10 +2,16 @@
 
 try:
     from matplotlib.backends.qt_compat import QtGui, QtCore, QtWidgets
+
+    from matplotlib.backends.backend_qt5 import FigureManagerQT
+    from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg
 except ImportError:
     try:
         from matplotlib.backends.qt4_compat import QtGui, QtCore
         QtWidgets = QtGui
+
+        from matplotlib.backends.backend_qt4 import FigureManagerQT
+        from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg
     except ImportError:
         # Mock objects
         class QtGui_cls(object):
@@ -26,6 +32,9 @@ def Signal(self, *args, **kwargs):
         QtGui = QtWidgets = QtGui_cls()
         QtCore = QtCore_cls()
 
+        FigureManagerQT = object
+        FigureCanvasQTAgg = object
+
         has_qt = False
 
 Qt = QtCore.Qt

diff --git a/skimage/viewer/utils/core.py b/skimage/viewer/utils/core.py
@@ -1,21 +1,15 @@
 import warnings
 
 import numpy as np
-from skimage.viewer.qt import QtGui, has_qt
+from skimage.viewer.qt import QtWidgets, has_qt, FigureManagerQT, FigureCanvasQTAgg
 import matplotlib as mpl
 from matplotlib.figure import Figure
 from matplotlib import _pylab_helpers
 from matplotlib.colors import LinearSegmentedColormap
 
-if has_qt:
-    from matplotlib.backends.backend_qt4 import FigureManagerQT
-    from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg
-    if 'agg' not in mpl.get_backend().lower():
-        warnings.warn("Recommended matplotlib backend is `Agg` for full "
-              "skimage.viewer functionality.")
-else:
-    FigureManagerQT = object
-    FigureCanvasQTAgg = object
+if has_qt and 'agg' not in mpl.get_backend().lower():
+    warnings.warn("Recommended matplotlib backend is `Agg` for full "
+                  "skimage.viewer functionality.")
 
 
 __all__ = ['init_qtapp', 'start_qtapp', 'RequiredAttr', 'figimage',
@@ -32,9 +26,9 @@ def init_qtapp():
     The QApplication needs to be initialized before creating any QWidgets
     """
     global QApp
-    QApp = QtGui.QApplication.instance()
+    QApp = QtWidgets.QApplication.instance()
     if QApp is None:
-        QApp = QtGui.QApplication([])
+        QApp = QtWidgets.QApplication([])
     return QApp
 
 
@@ -121,8 +115,8 @@ def __init__(self, figure, **kwargs):
         self.fig = figure
         FigureCanvasQTAgg.__init__(self, self.fig)
         FigureCanvasQTAgg.setSizePolicy(self,
-                                        QtGui.QSizePolicy.Expanding,
-                                        QtGui.QSizePolicy.Expanding)
+                                        QtWidgets.QSizePolicy.Expanding,
+                                        QtWidgets.QSizePolicy.Expanding)
         FigureCanvasQTAgg.updateGeometry(self)
 
     def resizeEvent(self, event):