Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit f8855f2

Browse files
author
Daniel O'Connor
committed
Use the same logic as MPL uses when picking Qt interface.
Thanks to Michael Droettboom (matplotlib#2221 (comment))
1 parent 80b95ed commit f8855f2

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

examples/animation/old_animation/animation_blit_qt4.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,12 @@
1111
from matplotlib.figure import Figure
1212
from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas
1313

14-
try:
14+
from matplotlib.backends import qt4_compat
15+
use_pyside = qt4_compat.QT_API == qt4_compat.QT_API_PYSIDE
16+
17+
if use_pyside:
1518
from PySide import QtCore, QtGui
16-
except ImportError:
19+
else:
1720
from PyQt4 import QtCore, QtGui
1821

1922
ITERS = 1000

examples/user_interfaces/embedding_in_qt4.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111

1212
from __future__ import unicode_literals
1313
import sys, os, random
14-
try:
14+
from matplotlib.backends import qt4_compat
15+
use_pyside = qt4_compat.QT_API == qt4_compat.QT_API_PYSIDE
16+
if use_pyside:
1517
from PySide import QtGui, QtCore
16-
usepyside = True
17-
except ImportError:
18+
else:
1819
from PyQt4 import QtGui, QtCore
19-
usepyside = False
2020

2121
from numpy import arange, sin, pi
2222
from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas
@@ -62,7 +62,7 @@ class MyDynamicMplCanvas(MyMplCanvas):
6262
def __init__(self, *args, **kwargs):
6363
MyMplCanvas.__init__(self, *args, **kwargs)
6464
timer = QtCore.QTimer(self)
65-
if usepyside:
65+
if use_pyside:
6666
timer.timeout.connect(self.update_figure)
6767
else:
6868
QtCore.QObject.connect(timer, QtCore.SIGNAL("timeout()"), self.update_figure)

examples/user_interfaces/embedding_in_qt4_wtoolbar.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,13 @@
88
from matplotlib.backends.backend_qt4agg import (
99
FigureCanvasQTAgg as FigureCanvas,
1010
NavigationToolbar2QTAgg as NavigationToolbar)
11-
try:
11+
from matplotlib.backends import qt4_compat
12+
use_pyside = qt4_compat.QT_API == qt4_compat.QT_API_PYSIDE
13+
14+
if use_pyside:
1215
from PySide.QtCore import *
1316
from PySide.QtGui import *
14-
except ImportError:
17+
else:
1518
from PyQt4.QtCore import *
1619
from PyQt4.QtGui import *
1720

0 commit comments

Comments
 (0)