fixed circular import
This commit is contained in:
parent
a069104c6b
commit
f21e0b86a4
@ -1,19 +1,11 @@
|
|||||||
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):
|
|||||||
|
|
||||||
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)
|
||||||
|
|
||||||
|
@ -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']
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user