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

Merge pull request #1830 from j9ac9k/Address-missing-enums

Browse Source 
Add missing enums
This commit is contained in:
Ogi Moore 2021-06-11 08:46:20 -07:00 committed by GitHub
commit e2b0a5ffae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pyqtgraph/GraphicsScene/GraphicsScene.py
View File

@ -165,18 +165,18 @@ class GraphicsScene(QtGui.QGraphicsScene):
## set focus on the topmost focusable item under this click ## set focus on the topmost focusable item under this click
items = self.items(ev.scenePos()) items = self.items(ev.scenePos())
for i in items: for i in items:
if i.isEnabled() and i.isVisible() and (i.flags() & i.ItemIsFocusable): if i.isEnabled() and i.isVisible() and (i.flags() & i.GraphicsItemFlag.ItemIsFocusable):
i.setFocus(QtCore.Qt.FocusReason.MouseFocusReason) i.setFocus(QtCore.Qt.FocusReason.MouseFocusReason)
break break
def _moveEventIsAllowed(self): def _moveEventIsAllowed(self):
# For ignoring events that are too close together # For ignoring events that are too close together
# Max number of events per second # Max number of events per second
rateLimit = getConfigOption('mouseRateLimit') rateLimit = getConfigOption('mouseRateLimit')
if rateLimit <= 0: if rateLimit <= 0:
return True return True
# Delay between events (in milliseconds) # Delay between events (in milliseconds)
delay = 1000.0 / rateLimit delay = 1000.0 / rateLimit
if getMillis() - self._lastMoveEventTime >= delay: if getMillis() - self._lastMoveEventTime >= delay:
@ -344,7 +344,7 @@ class GraphicsScene(QtGui.QGraphicsScene):
if event.isAccepted(): if event.isAccepted():
#print " --> accepted" #print " --> accepted"
self.dragItem = item self.dragItem = item
if item.flags() & item.ItemIsFocusable: if item.flags() & item.GraphicsItemFlag.ItemIsFocusable:
item.setFocus(QtCore.Qt.FocusReason.MouseFocusReason) item.setFocus(QtCore.Qt.FocusReason.MouseFocusReason)
break break
elif self.dragItem is not None: elif self.dragItem is not None:
@ -389,7 +389,7 @@ class GraphicsScene(QtGui.QGraphicsScene):
debug.printExc("Error sending click event:") debug.printExc("Error sending click event:")
if ev.isAccepted(): if ev.isAccepted():
if item.flags() & item.ItemIsFocusable: if item.flags() & item.GraphicsItemFlag.ItemIsFocusable:
item.setFocus(QtCore.Qt.FocusReason.MouseFocusReason) item.setFocus(QtCore.Qt.FocusReason.MouseFocusReason)
break break
self.sigMouseClicked.emit(ev) self.sigMouseClicked.emit(ev)

3
pyqtgraph/graphicsItems/CurvePoint.py
View File

@ -29,8 +29,7 @@ class CurvePoint(GraphicsObject):
self.setProperty('position', 0.0) self.setProperty('position', 0.0)
self.setProperty('index', 0) self.setProperty('index', 0)
if hasattr(self, 'ItemHasNoContents'): self.setFlags(self.flags() | self.GraphicsItemFlag.ItemHasNoContents)
self.setFlags(self.flags() | self.GraphicsItemFlag.ItemHasNoContents)
if pos is not None: if pos is not None:
self.setPos(pos) self.setPos(pos)

3
pyqtgraph/graphicsItems/ItemGroup.py
View File

@ -9,8 +9,7 @@ class ItemGroup(GraphicsObject):
def __init__(self, *args): def __init__(self, *args):
GraphicsObject.__init__(self, *args) GraphicsObject.__init__(self, *args)
if hasattr(self, "ItemHasNoContents"): self.setFlag(self.GraphicsItemFlag.ItemHasNoContents)
self.setFlag(self.GraphicsItemFlag.ItemHasNoContents)
def boundingRect(self): def boundingRect(self):
return QtCore.QRectF() return QtCore.QRectF()