From f21e0b86a4d6c3c075fdbce6760728bb3a0b2ba3 Mon Sep 17 00:00:00 2001
From: Luke Campagnola <luke.campagnola@gmail.com>
Date: Mon, 23 Dec 2013 10:22:53 -0500
Subject: [PATCH] fixed circular import
---
pyqtgraph/GraphicsScene/GraphicsScene.py | 9 +--------
pyqtgraph/graphicsItems/GraphItem.py | 1 +
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/pyqtgraph/GraphicsScene/GraphicsScene.py b/pyqtgraph/GraphicsScene/GraphicsScene.py
index cce7ac4a..d61a1fa4 100644
--- a/pyqtgraph/GraphicsScene/GraphicsScene.py
+++ b/pyqtgraph/GraphicsScene/GraphicsScene.py
@@ -1,19 +1,11 @@
from ..Qt import QtCore, QtGui
-
from ..python2_3 import sortList
-#try:
- #from PyQt4 import QtOpenGL
- #HAVE_OPENGL = True
-#except ImportError:
- #HAVE_OPENGL = False
-
import weakref
from ..Point import Point
from .. import functions as fn
from .. import ptime as ptime
from .mouseEvents import *
from .. import debug as debug
-from . import exportDialog
if hasattr(QtCore, 'PYQT_VERSION'):
try:
@@ -552,6 +544,7 @@ class GraphicsScene(QtGui.QGraphicsScene):
def showExportDialog(self):
if self.exportDialog is None:
+ from . import exportDialog
self.exportDialog = exportDialog.ExportDialog(self)
self.exportDialog.show(self.contextMenuItem)
diff --git a/pyqtgraph/graphicsItems/GraphItem.py b/pyqtgraph/graphicsItems/GraphItem.py
index 63b5afbd..97759522 100644
--- a/pyqtgraph/graphicsItems/GraphItem.py
+++ b/pyqtgraph/graphicsItems/GraphItem.py
@@ -3,6 +3,7 @@ from .GraphicsObject import GraphicsObject
from .ScatterPlotItem import ScatterPlotItem
from ..Qt import QtGui, QtCore
import numpy as np
+from .. import getConfigOption
__all__ = ['GraphItem']
--
GitLab