wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-06-29 08:31:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Separate qt version check from has_qt flag

Browse Source
This commit is contained in:
Steven Silvester
2014-12-30 21:01:23 -06:00
parent 7da4d5a19a
commit d714d0bcbc
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/viewer/qt.py
+7 -5
View File
@@ -1,10 +1,13 @@
_qt_version = None
has_qt = True
try:
from matplotlib.backends.qt_compat import QtGui, QtCore, QtWidgets, QT_RC_MAJOR_VERSION as has_qt
from matplotlib.backends.qt_compat import QtGui, QtCore, QtWidgets, QT_RC_MAJOR_VERSION as _qt_version
except ImportError:
try:
from matplotlib.backends.qt4_compat import QtGui, QtCore
QtWidgets = QtGui
has_qt = 4
_qt_version = 4
except ImportError:
# Mock objects
class QtGui_cls(object):
@@ -27,14 +30,13 @@ except ImportError:
has_qt = False
if has_qt == 5:
if _qt_version == 5:
from matplotlib.backends.backend_qt5 import FigureManagerQT
from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg
elif has_qt == 4:
elif _qt_version == 4:
from matplotlib.backends.backend_qt4 import FigureManagerQT
from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg
else:
assert not has_qt, 'Unsupported Qt version {0}'.format(has_qt)
FigureManagerQT = object
FigureCanvasQTAgg = object