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

Fix issue with int comparson impacting Qt6

Browse Source
This commit is contained in:
Ogi Moore 2021-05-28 11:31:57 -07:00
parent ee951331be
commit 648b8c7df4
1 changed files with 45 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pyqtgraph/graphicsItems/ROI.py
View File

@ -795,13 +795,24 @@ class ROI(GraphicsObject):
self.mouseDragHandler.mouseDragEvent(ev) self.mouseDragHandler.mouseDragEvent(ev)
def mouseClickEvent(self, ev): def mouseClickEvent(self, ev):
with warnings.catch_warnings():
# warning present on pyqt5 5.12 + python 3.8
warnings.filterwarnings(
"ignore",
message=(
".*Implicit conversion to integers using __int__ is "
"deprecated, and may be removed in a future version of "
"Python."
),
category=DeprecationWarning
)
if ev.button() == QtCore.Qt.RightButton and self.isMoving: if ev.button() == QtCore.Qt.RightButton and self.isMoving:
ev.accept() ev.accept()
self.cancelMove() self.cancelMove()
if ev.button() == QtCore.Qt.RightButton and self.contextMenuEnabled(): if ev.button() == QtCore.Qt.RightButton and self.contextMenuEnabled():
self.raiseContextMenu(ev) self.raiseContextMenu(ev)
ev.accept() ev.accept()
elif ev.button() & self.acceptedMouseButtons() > 0: elif ev.button() & self.acceptedMouseButtons():
ev.accept() ev.accept()
self.sigClicked.emit(self, ev) self.sigClicked.emit(self, ev)
else: else:
@ -1400,6 +1411,17 @@ class Handle(UIGraphicsItem):
self.update() self.update()
def mouseClickEvent(self, ev): def mouseClickEvent(self, ev):
with warnings.catch_warnings():
# warning present on pyqt5 5.12 + python 3.8
warnings.filterwarnings(
"ignore",
message=(
".*Implicit conversion to integers using __int__ is "
"deprecated, and may be removed in a future version of "
"Python."
),
category=DeprecationWarning
)
## right-click cancels drag ## right-click cancels drag
if ev.button() == QtCore.Qt.RightButton and self.isMoving: if ev.button() == QtCore.Qt.RightButton and self.isMoving:
self.isMoving = False ## prevents any further motion self.isMoving = False ## prevents any further motion