Enforced LF file endings
removed stray print statement
This commit is contained in:
parent
4d1a5ded1b
commit
0f1f6c62e4
@ -1,41 +1,41 @@
|
||||
from pyqtgraph.Qt import QtCore, QtGui
|
||||
|
||||
class ThreadsafeTimer(QtCore.QObject):
|
||||
"""
|
||||
Thread-safe replacement for QTimer.
|
||||
"""
|
||||
|
||||
timeout = QtCore.Signal()
|
||||
sigTimerStopRequested = QtCore.Signal()
|
||||
sigTimerStartRequested = QtCore.Signal(object)
|
||||
|
||||
def __init__(self):
|
||||
QtCore.QObject.__init__(self)
|
||||
self.timer = QtCore.QTimer()
|
||||
self.timer.timeout.connect(self.timerFinished)
|
||||
self.timer.moveToThread(QtCore.QCoreApplication.instance().thread())
|
||||
self.moveToThread(QtCore.QCoreApplication.instance().thread())
|
||||
self.sigTimerStopRequested.connect(self.stop, QtCore.Qt.QueuedConnection)
|
||||
self.sigTimerStartRequested.connect(self.start, QtCore.Qt.QueuedConnection)
|
||||
|
||||
|
||||
def start(self, timeout):
|
||||
isGuiThread = QtCore.QThread.currentThread() == QtCore.QCoreApplication.instance().thread()
|
||||
if isGuiThread:
|
||||
#print "start timer", self, "from gui thread"
|
||||
self.timer.start(timeout)
|
||||
else:
|
||||
#print "start timer", self, "from remote thread"
|
||||
self.sigTimerStartRequested.emit(timeout)
|
||||
|
||||
def stop(self):
|
||||
isGuiThread = QtCore.QThread.currentThread() == QtCore.QCoreApplication.instance().thread()
|
||||
if isGuiThread:
|
||||
#print "stop timer", self, "from gui thread"
|
||||
self.timer.stop()
|
||||
else:
|
||||
#print "stop timer", self, "from remote thread"
|
||||
self.sigTimerStopRequested.emit()
|
||||
|
||||
def timerFinished(self):
|
||||
from pyqtgraph.Qt import QtCore, QtGui
|
||||
|
||||
class ThreadsafeTimer(QtCore.QObject):
|
||||
"""
|
||||
Thread-safe replacement for QTimer.
|
||||
"""
|
||||
|
||||
timeout = QtCore.Signal()
|
||||
sigTimerStopRequested = QtCore.Signal()
|
||||
sigTimerStartRequested = QtCore.Signal(object)
|
||||
|
||||
def __init__(self):
|
||||
QtCore.QObject.__init__(self)
|
||||
self.timer = QtCore.QTimer()
|
||||
self.timer.timeout.connect(self.timerFinished)
|
||||
self.timer.moveToThread(QtCore.QCoreApplication.instance().thread())
|
||||
self.moveToThread(QtCore.QCoreApplication.instance().thread())
|
||||
self.sigTimerStopRequested.connect(self.stop, QtCore.Qt.QueuedConnection)
|
||||
self.sigTimerStartRequested.connect(self.start, QtCore.Qt.QueuedConnection)
|
||||
|
||||
|
||||
def start(self, timeout):
|
||||
isGuiThread = QtCore.QThread.currentThread() == QtCore.QCoreApplication.instance().thread()
|
||||
if isGuiThread:
|
||||
#print "start timer", self, "from gui thread"
|
||||
self.timer.start(timeout)
|
||||
else:
|
||||
#print "start timer", self, "from remote thread"
|
||||
self.sigTimerStartRequested.emit(timeout)
|
||||
|
||||
def stop(self):
|
||||
isGuiThread = QtCore.QThread.currentThread() == QtCore.QCoreApplication.instance().thread()
|
||||
if isGuiThread:
|
||||
#print "stop timer", self, "from gui thread"
|
||||
self.timer.stop()
|
||||
else:
|
||||
#print "stop timer", self, "from remote thread"
|
||||
self.sigTimerStopRequested.emit()
|
||||
|
||||
def timerFinished(self):
|
||||
self.timeout.emit()
|
0
examples/Arrow.py
Executable file → Normal file
0
examples/Arrow.py
Executable file → Normal file
0
examples/GraphicsLayout.py
Executable file → Normal file
0
examples/GraphicsLayout.py
Executable file → Normal file
0
examples/ScatterPlot.py
Executable file → Normal file
0
examples/ScatterPlot.py
Executable file → Normal file
0
examples/ViewBox.py
Executable file → Normal file
0
examples/ViewBox.py
Executable file → Normal file
@ -247,7 +247,6 @@ class PlotDataItem(GraphicsObject):
|
||||
if len(args) == 1:
|
||||
data = args[0]
|
||||
dt = dataType(data)
|
||||
print "plot:", dt, type(data)
|
||||
if dt == 'empty':
|
||||
pass
|
||||
elif dt == 'listOfValues':
|
||||
|
0
graphicsItems/ROI.py
Executable file → Normal file
0
graphicsItems/ROI.py
Executable file → Normal file
Loading…
Reference in New Issue
Block a user