Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 02f04ff

Browse filesBrowse files
committed
Minor cleanups of the qt4 embedding examples.
`embedding_in_qt4_sgskip.py` would not run if the backend is set to qt5agg in the rcfile, so we explicitly set it to qt4agg. Importing QtCore, QtGui from qt_compat is simpler than explicitly checking for PySide.
1 parent eb6e422 commit 02f04ff
Copy full SHA for 02f04ff

File tree

Expand file treeCollapse file tree

2 files changed

+16
-28
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+16
-28
lines changed

‎examples/user_interfaces/embedding_in_qt4_sgskip.py

Copy file name to clipboardExpand all lines: examples/user_interfaces/embedding_in_qt4_sgskip.py
+7-9Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,20 @@
1414
"""
1515

1616
from __future__ import unicode_literals
17-
import sys
1817
import os
1918
import random
20-
from matplotlib.backends import qt_compat
21-
use_pyside = qt_compat.QT_API == qt_compat.QT_API_PYSIDE
22-
if use_pyside:
23-
from PySide import QtGui, QtCore
24-
else:
25-
from PyQt4 import QtGui, QtCore
19+
import sys
2620

2721
from numpy import arange, sin, pi
28-
from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas
22+
23+
import matplotlib
24+
matplotlib.use("Qt4Agg")
25+
from matplotlib.backends.backend_qt4agg import (
26+
FigureCanvasQTAgg as FigureCanvas)
27+
from matplotlib.backends.qt_compat import QtCore, QtGui
2928
from matplotlib.figure import Figure
3029

3130
progname = os.path.basename(sys.argv[0])
32-
progversion = "0.1"
3331

3432

3533
class MyMplCanvas(FigureCanvas):

‎examples/user_interfaces/embedding_in_qt4_wtoolbar_sgskip.py

Copy file name to clipboardExpand all lines: examples/user_interfaces/embedding_in_qt4_wtoolbar_sgskip.py
+9-19Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,46 +9,38 @@
99
import sys
1010

1111
import numpy as np
12+
1213
import matplotlib
1314
matplotlib.use("Qt4Agg")
14-
from matplotlib.figure import Figure
1515
from matplotlib.backend_bases import key_press_handler
1616
from matplotlib.backends.backend_qt4agg import (
1717
FigureCanvasQTAgg as FigureCanvas,
1818
NavigationToolbar2QT as NavigationToolbar)
19-
from matplotlib.backends import qt_compat
20-
use_pyside = qt_compat.QT_API == qt_compat.QT_API_PYSIDE
21-
22-
if use_pyside:
23-
from PySide.QtCore import *
24-
from PySide.QtGui import *
25-
else:
26-
from PyQt4.QtCore import *
27-
from PyQt4.QtGui import *
19+
from matplotlib.backends.qt_compat import QtCore, QtGui
20+
from matplotlib.figure import Figure
2821

2922

30-
class AppForm(QMainWindow):
23+
class AppForm(QtGui.QMainWindow):
3124
def __init__(self, parent=None):
32-
QMainWindow.__init__(self, parent)
33-
#self.x, self.y = self.get_data()
25+
QtGui.QMainWindow.__init__(self, parent)
3426
self.data = self.get_data2()
3527
self.create_main_frame()
3628
self.on_draw()
3729

3830
def create_main_frame(self):
39-
self.main_frame = QWidget()
31+
self.main_frame = QtGui.QWidget()
4032

4133
self.fig = Figure((5.0, 4.0), dpi=100)
4234
self.canvas = FigureCanvas(self.fig)
4335
self.canvas.setParent(self.main_frame)
44-
self.canvas.setFocusPolicy(Qt.StrongFocus)
36+
self.canvas.setFocusPolicy(QtCore.Qt.StrongFocus)
4537
self.canvas.setFocus()
4638

4739
self.mpl_toolbar = NavigationToolbar(self.canvas, self.main_frame)
4840

4941
self.canvas.mpl_connect('key_press_event', self.on_key_press)
5042

51-
vbox = QVBoxLayout()
43+
vbox = QtGui.QVBoxLayout()
5244
vbox.addWidget(self.canvas) # the matplotlib canvas
5345
vbox.addWidget(self.mpl_toolbar)
5446
self.main_frame.setLayout(vbox)
@@ -60,9 +52,7 @@ def get_data2(self):
6052
def on_draw(self):
6153
self.fig.clear()
6254
self.axes = self.fig.add_subplot(111)
63-
#self.axes.plot(self.x, self.y, 'ro')
6455
self.axes.imshow(self.data, interpolation='nearest')
65-
#self.axes.plot([1,2,3])
6656
self.canvas.draw()
6757

6858
def on_key_press(self, event):
@@ -73,7 +63,7 @@ def on_key_press(self, event):
7363

7464

7565
def main():
76-
app = QApplication(sys.argv)
66+
app = QtGui.QApplication(sys.argv)
7767
form = AppForm()
7868
form.show()
7969
app.exec_()

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.