Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
EO Time Series Viewer
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Contributor analytics
CI/CD analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Benjamin Jakimow
EO Time Series Viewer
Commits
7a7288b6
Commit
7a7288b6
authored
11 years ago
by
Luke Campagnola
Browse files
Options
Downloads
Patches
Plain Diff
Fixed documentation for 'uver/under' in DockArea
Configure matplotlib to use PySide in MatplotlibWidget
parent
ee0825d6
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
README.txt
+7
-1
7 additions, 1 deletion
README.txt
pyqtgraph/dockarea/DockArea.py
+3
-3
3 additions, 3 deletions
pyqtgraph/dockarea/DockArea.py
pyqtgraph/widgets/MatplotlibWidget.py
+5
-1
5 additions, 1 deletion
pyqtgraph/widgets/MatplotlibWidget.py
with
15 additions
and
5 deletions
README.txt
+
7
−
1
View file @
7a7288b6
...
...
@@ -2,10 +2,16 @@ PyQtGraph - A pure-Python graphics library for PyQt/PySide
Copyright 2012 Luke Campagnola, University of North Carolina at Chapel Hill
http://www.pyqtgraph.org
Authors
:
Maintainer
:
Luke Campagnola ('luke.campagnola@%s.com' % 'gmail')
Contributors:
Megan Kratz
Paul Manis
Ingo Breßler
Christian Gavin
Michael Cristopher Hogg
Ulrich Leutner
Requirements:
PyQt 4.7+ or PySide
...
...
This diff is collapsed.
Click to expand it.
pyqtgraph/dockarea/DockArea.py
+
3
−
3
View file @
7a7288b6
...
...
@@ -40,11 +40,11 @@ class DockArea(Container, QtGui.QWidget, DockDrop):
Arguments:
dock The new Dock object to add. If None, then a new Dock will be
created.
position
'
bottom
'
,
'
top
'
,
'
left
'
,
'
right
'
,
'
ove
r
'
, or
'
under
'
position
'
bottom
'
,
'
top
'
,
'
left
'
,
'
right
'
,
'
ab
ove
'
, or
'
below
'
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
the new Dock is placed adjacent to it (or in a tabbed
configuration for
'
ove
r
'
and
'
under
'
).
configuration for
'
ab
ove
'
and
'
below
'
).
=========== =================================================================
All extra keyword arguments are passed to Dock.__init__() if *dock* is
...
...
@@ -316,4 +316,4 @@ class DockArea(Container, QtGui.QWidget, DockDrop):
DockDrop
.
dropEvent
(
self
,
*
args
)
\ No newline at end of file
This diff is collapsed.
Click to expand it.
pyqtgraph/widgets/MatplotlibWidget.py
+
5
−
1
View file @
7a7288b6
from
pyqtgraph.Qt
import
QtGui
,
QtCore
from
pyqtgraph.Qt
import
QtGui
,
QtCore
,
USE_PYSIDE
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
NavigationToolbar2QTAgg
as
NavigationToolbar
from
matplotlib.figure
import
Figure
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment