Skip to content

Commit 65b657f

Browse files
authored
Merge pull request #57 from maxnoe/fix_qt_import
Fix qt import, fixes #55
2 parents e9c1f53 + 4e7138f commit 65b657f

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@
2727
"Programming Language :: Python :: 3",
2828
],
2929
packages=find_packages(),
30-
install_requires=["numpy", "matplotlib", "colorspacious"],
30+
install_requires=["numpy", "matplotlib", "colorspacious", "scipy"],
3131
package_data={'viscm': ['examples/*']},
3232
)

viscm/gui.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
# Do this first before any other matplotlib imports, to force matplotlib to
1717
# use a Qt backend
1818
from matplotlib.backends.qt_compat import QtWidgets, QtCore, QtGui, _getSaveFileName
19-
from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas4
20-
from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas5
2119

22-
def FigureCanvas(fig):
20+
try:
21+
from matplotlib.backends.backend_qtagg import FigureCanvasQTAgg as FigureCanvas
22+
except ImportError:
2323
try:
24-
return FigureCanvas5(fig)
25-
except Exception:
26-
return FigureCanvas4(fig)
24+
from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
25+
except ImportError:
26+
from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas
2727

2828
import matplotlib
2929
import matplotlib.pyplot as plt

0 commit comments

Comments
 (0)