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
f21e0b86
Commit
f21e0b86
authored
11 years ago
by
Luke Campagnola
Browse files
Options
Downloads
Patches
Plain Diff
fixed circular import
parent
a069104c
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
pyqtgraph/GraphicsScene/GraphicsScene.py
+1
-8
1 addition, 8 deletions
pyqtgraph/GraphicsScene/GraphicsScene.py
pyqtgraph/graphicsItems/GraphItem.py
+1
-0
1 addition, 0 deletions
pyqtgraph/graphicsItems/GraphItem.py
with
2 additions
and
8 deletions
pyqtgraph/GraphicsScene/GraphicsScene.py
+
1
−
8
View file @
f21e0b86
from
..Qt
import
QtCore
,
QtGui
from
..Qt
import
QtCore
,
QtGui
from
..python2_3
import
sortList
from
..python2_3
import
sortList
#try:
#from PyQt4 import QtOpenGL
#HAVE_OPENGL = True
#except ImportError:
#HAVE_OPENGL = False
import
weakref
import
weakref
from
..Point
import
Point
from
..Point
import
Point
from
..
import
functions
as
fn
from
..
import
functions
as
fn
from
..
import
ptime
as
ptime
from
..
import
ptime
as
ptime
from
.mouseEvents
import
*
from
.mouseEvents
import
*
from
..
import
debug
as
debug
from
..
import
debug
as
debug
from
.
import
exportDialog
if
hasattr
(
QtCore
,
'
PYQT_VERSION
'
):
if
hasattr
(
QtCore
,
'
PYQT_VERSION
'
):
try
:
try
:
...
@@ -552,6 +544,7 @@ class GraphicsScene(QtGui.QGraphicsScene):
...
@@ -552,6 +544,7 @@ class GraphicsScene(QtGui.QGraphicsScene):
def
showExportDialog
(
self
):
def
showExportDialog
(
self
):
if
self
.
exportDialog
is
None
:
if
self
.
exportDialog
is
None
:
from
.
import
exportDialog
self
.
exportDialog
=
exportDialog
.
ExportDialog
(
self
)
self
.
exportDialog
=
exportDialog
.
ExportDialog
(
self
)
self
.
exportDialog
.
show
(
self
.
contextMenuItem
)
self
.
exportDialog
.
show
(
self
.
contextMenuItem
)
...
...
This diff is collapsed.
Click to expand it.
pyqtgraph/graphicsItems/GraphItem.py
+
1
−
0
View file @
f21e0b86
...
@@ -3,6 +3,7 @@ from .GraphicsObject import GraphicsObject
...
@@ -3,6 +3,7 @@ from .GraphicsObject import GraphicsObject
from
.ScatterPlotItem
import
ScatterPlotItem
from
.ScatterPlotItem
import
ScatterPlotItem
from
..Qt
import
QtGui
,
QtCore
from
..Qt
import
QtGui
,
QtCore
import
numpy
as
np
import
numpy
as
np
from
..
import
getConfigOption
__all__
=
[
'
GraphItem
'
]
__all__
=
[
'
GraphItem
'
]
...
...
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