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

remove Qt4 mouse wheel handling

Browse Source
This commit is contained in:
KIU Shueng Chuan 2021-06-29 12:30:46 +08:00
parent 1a29cf7579
commit b843214f66
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pyqtgraph/opengl/GLViewWidget.py
View File

@ -1,4 +1,4 @@
from ..Qt import QtCore, QtGui, QtWidgets, QT_LIB from ..Qt import QtCore, QtGui, QtWidgets
from OpenGL.GL import * from OpenGL.GL import *
import OpenGL.GL.framebufferobjects as glfbo import OpenGL.GL.framebufferobjects as glfbo
import numpy as np import numpy as np
@ -466,13 +466,9 @@ class GLViewWidget(QtWidgets.QOpenGLWidget):
#self.swapBuffers() #self.swapBuffers()
def wheelEvent(self, ev): def wheelEvent(self, ev):
delta = 0 delta = ev.angleDelta().x()
if QT_LIB in ['PyQt4', 'PySide']: if delta == 0:
delta = ev.delta() delta = ev.angleDelta().y()
else:
delta = ev.angleDelta().x()
if delta == 0:
delta = ev.angleDelta().y()
if (ev.modifiers() & QtCore.Qt.KeyboardModifier.ControlModifier): if (ev.modifiers() & QtCore.Qt.KeyboardModifier.ControlModifier):
self.opts['fov'] *= 0.999**delta self.opts['fov'] *= 0.999**delta
else: else:

10
pyqtgraph/widgets/GraphicsView.py
View File

@ -317,13 +317,9 @@ class GraphicsView(QtGui.QGraphicsView):
super().wheelEvent(ev) super().wheelEvent(ev)
if not self.mouseEnabled: if not self.mouseEnabled:
return return
delta = 0 delta = ev.angleDelta().x()
if QT_LIB in ['PyQt4', 'PySide']: if delta == 0:
delta = ev.delta() delta = ev.angleDelta().y()
else:
delta = ev.angleDelta().x()
if delta == 0:
delta = ev.angleDelta().y()
sc = 1.001 ** delta sc = 1.001 ** delta
#self.scale *= sc #self.scale *= sc