ASCEE/pyqtgraph
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed documentation for 'uver/under' in DockArea

Browse Source 
Configure matplotlib to use PySide in MatplotlibWidget
This commit is contained in:
Luke Campagnola 2013-05-28 15:31:10 -04:00
parent ee0825d677
commit 7a7288b6b3
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.txt
View File

@ -2,10 +2,16 @@ PyQtGraph - A pure-Python graphics library for PyQt/PySide
Copyright 2012 Luke Campagnola, University of North Carolina at Chapel Hill Copyright 2012 Luke Campagnola, University of North Carolina at Chapel Hill
http://www.pyqtgraph.org http://www.pyqtgraph.org
Authors: Maintainer:
Luke Campagnola ('luke.campagnola@%s.com' % 'gmail') Luke Campagnola ('luke.campagnola@%s.com' % 'gmail')
Contributors:
Megan Kratz Megan Kratz
Paul Manis
Ingo Breßler Ingo Breßler
Christian Gavin
Michael Cristopher Hogg
Ulrich Leutner
Requirements: Requirements:
PyQt 4.7+ or PySide PyQt 4.7+ or PySide

4
pyqtgraph/dockarea/DockArea.py
View File

@ -40,11 +40,11 @@ class DockArea(Container, QtGui.QWidget, DockDrop):
Arguments: Arguments:
dock The new Dock object to add. If None, then a new Dock will be dock The new Dock object to add. If None, then a new Dock will be
created. created.
position 'bottom', 'top', 'left', 'right', 'over', or 'under' position 'bottom', 'top', 'left', 'right', 'above', or 'below'
relativeTo If relativeTo is None, then the new Dock is added to fill an relativeTo If relativeTo is None, then the new Dock is added to fill an
entire edge of the window. If relativeTo is another Dock, then entire edge of the window. If relativeTo is another Dock, then
the new Dock is placed adjacent to it (or in a tabbed the new Dock is placed adjacent to it (or in a tabbed
configuration for 'over' and 'under'). configuration for 'above' and 'below').
=========== ================================================================= =========== =================================================================
All extra keyword arguments are passed to Dock.__init__() if *dock* is All extra keyword arguments are passed to Dock.__init__() if *dock* is

6
pyqtgraph/widgets/MatplotlibWidget.py
View File

@ -1,5 +1,9 @@
from pyqtgraph.Qt import QtGui, QtCore from pyqtgraph.Qt import QtGui, QtCore, USE_PYSIDE
import matplotlib import matplotlib
if USE_PYSIDE:
matplotlib.rcParams['backend.qt4']='PySide'
from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas
from matplotlib.backends.backend_qt4agg import NavigationToolbar2QTAgg as NavigationToolbar from matplotlib.backends.backend_qt4agg import NavigationToolbar2QTAgg as NavigationToolbar
from matplotlib.figure import Figure from matplotlib.figure import Figure