ASCEE/pyqtgraph
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Emit event with mouse clicks for some items (#1414)

Browse Source 
Harmonizes behavior with PlotCurveItem.
This commit is contained in:
lidstrom83 2020-10-22 11:17:59 -07:00 committed by GitHub
parent 27ca1747f1
commit 0dacc57e02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pyqtgraph/graphicsItems/PlotDataItem.py
View File

@ -22,18 +22,18 @@ class PlotDataItem(GraphicsObject):
usually created by plot() methods such as :func:`pyqtgraph.plot` and usually created by plot() methods such as :func:`pyqtgraph.plot` and
:func:`PlotItem.plot() <pyqtgraph.PlotItem.plot>`. :func:`PlotItem.plot() <pyqtgraph.PlotItem.plot>`.
============================== ============================================== ================================== ==============================================
**Signals:** **Signals:**
sigPlotChanged(self) Emitted when the data in this item is updated. sigPlotChanged(self) Emitted when the data in this item is updated.
sigClicked(self) Emitted when the item is clicked. sigClicked(self, ev) Emitted when the item is clicked.
sigPointsClicked(self, points) Emitted when a plot point is clicked sigPointsClicked(self, points, ev) Emitted when a plot point is clicked
Sends the list of points under the mouse. Sends the list of points under the mouse.
============================== ============================================== ================================== ==============================================
""" """
sigPlotChanged = QtCore.Signal(object) sigPlotChanged = QtCore.Signal(object)
sigClicked = QtCore.Signal(object) sigClicked = QtCore.Signal(object, object)
sigPointsClicked = QtCore.Signal(object, object) sigPointsClicked = QtCore.Signal(object, object, object)
def __init__(self, *args, **kargs): def __init__(self, *args, **kargs):
""" """
@ -762,12 +762,12 @@ class PlotDataItem(GraphicsObject):
def appendData(self, *args, **kargs): def appendData(self, *args, **kargs):
pass pass
def curveClicked(self): def curveClicked(self, curve, ev):
self.sigClicked.emit(self) self.sigClicked.emit(self, ev)
def scatterClicked(self, plt, points): def scatterClicked(self, plt, points, ev):
self.sigClicked.emit(self) self.sigClicked.emit(self, ev)
self.sigPointsClicked.emit(self, points) self.sigPointsClicked.emit(self, points, ev)
def viewRangeChanged(self): def viewRangeChanged(self):
# view range has changed; re-plot if needed # view range has changed; re-plot if needed

10
pyqtgraph/graphicsItems/ScatterPlotItem.py
View File

@ -247,16 +247,16 @@ class ScatterPlotItem(GraphicsObject):
or for all points. or for all points.
======================== =============================================== ============================ ===============================================
**Signals:** **Signals:**
sigPlotChanged(self) Emitted when the data being plotted has changed sigPlotChanged(self) Emitted when the data being plotted has changed
sigClicked(self, points) Emitted when the curve is clicked. Sends a list sigClicked(self, points, ev) Emitted when the curve is clicked. Sends a list
of all the points under the mouse pointer. of all the points under the mouse pointer.
======================== =============================================== ============================ ===============================================
""" """
#sigPointClicked = QtCore.Signal(object, object) #sigPointClicked = QtCore.Signal(object, object)
sigClicked = QtCore.Signal(object, object) ## self, points sigClicked = QtCore.Signal(object, object, object) ## self, points
sigPlotChanged = QtCore.Signal(object) sigPlotChanged = QtCore.Signal(object)
def __init__(self, *args, **kargs): def __init__(self, *args, **kargs):
""" """
@ -895,7 +895,7 @@ class ScatterPlotItem(GraphicsObject):
if len(pts) > 0: if len(pts) > 0:
self.ptsClicked = pts self.ptsClicked = pts
ev.accept() ev.accept()
self.sigClicked.emit(self, self.ptsClicked) self.sigClicked.emit(self, self.ptsClicked, ev)
else: else:
#print "no spots" #print "no spots"
ev.ignore() ev.ignore()

6
pyqtgraph/widgets/ScatterPlotWidget.py
View File

@ -33,7 +33,7 @@ class ScatterPlotWidget(QtGui.QSplitter):
specifying multiple criteria. specifying multiple criteria.
4) A PlotWidget for displaying the data. 4) A PlotWidget for displaying the data.
""" """
sigScatterPlotClicked = QtCore.Signal(object, object) sigScatterPlotClicked = QtCore.Signal(object, object, object)
def __init__(self, parent=None): def __init__(self, parent=None):
QtGui.QSplitter.__init__(self, QtCore.Qt.Horizontal) QtGui.QSplitter.__init__(self, QtCore.Qt.Horizontal)
@ -279,8 +279,8 @@ class ScatterPlotWidget(QtGui.QSplitter):
self._indexMap = {j:i for i,j in enumerate(self._visibleIndices)} self._indexMap = {j:i for i,j in enumerate(self._visibleIndices)}
return self._indexMap return self._indexMap
def plotClicked(self, plot, points): def plotClicked(self, plot, points, ev):
# Tag each point with its index into the original dataset # Tag each point with its index into the original dataset
for pt in points: for pt in points:
pt.originalIndex = self._visibleIndices[pt.index()] pt.originalIndex = self._visibleIndices[pt.index()]
self.sigScatterPlotClicked.emit(self, points) self.sigScatterPlotClicked.emit(self, points, ev)