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

Make high-dpi handling conditional on Qt version

Browse Source
This commit is contained in:
Luke Campagnola 2018-04-24 08:59:33 -07:00
parent 82e8194ea4
commit 063e9c91a9
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pyqtgraph/opengl/GLViewWidget.py
View File

@ -16,9 +16,13 @@ class GLViewWidget(QtOpenGL.QGLWidget):
- Axis/grid display - Axis/grid display
- Export options - Export options
High-DPI displays: Qt5 should automatically detect the correct resolution.
For Qt4, specify the ``devicePixelRatio`` argument when initializing the
widget (usually this value is 1-2).
""" """
def __init__(self, parent=None): def __init__(self, parent=None, devicePixelRatio=None):
global ShareWidget global ShareWidget
if ShareWidget is None: if ShareWidget is None:
@ -37,6 +41,7 @@ class GLViewWidget(QtOpenGL.QGLWidget):
'azimuth': 45, ## camera's azimuthal angle in degrees 'azimuth': 45, ## camera's azimuthal angle in degrees
## (rotation around z-axis 0 points along x-axis) ## (rotation around z-axis 0 points along x-axis)
'viewport': None, ## glViewport params; None == whole widget 'viewport': None, ## glViewport params; None == whole widget
'devicePixelRatio': devicePixelRatio,
} }
self.setBackgroundColor('k') self.setBackgroundColor('k')
self.items = [] self.items = []
@ -79,10 +84,21 @@ class GLViewWidget(QtOpenGL.QGLWidget):
def getViewport(self): def getViewport(self):
vp = self.opts['viewport'] vp = self.opts['viewport']
dpr = self.devicePixelRatio()
if vp is None: if vp is None:
return (0, 0, self.width() * self.devicePixelRatio(), self.height() * self.devicePixelRatio()) return (0, 0, int(self.width() * dpr), int(self.height() * dpr))
else: else:
return vp return tuple([int(x * dpr) for x in vp])
def devicePixelRatio(self):
dpr = self.opts['devicePixelRatio']
if dpr is not None:
return dpr
if hasattr(QtOpenGL.QGLWidget, 'devicePixelRatio'):
return QtOpenGL.QGLWidget.devicePixelRatio(self)
else:
return 1.0
def resizeGL(self, w, h): def resizeGL(self, w, h):
pass pass
@ -99,7 +115,8 @@ class GLViewWidget(QtOpenGL.QGLWidget):
def projectionMatrix(self, region=None): def projectionMatrix(self, region=None):
# Xw = (Xnd + 1) * width/2 + X # Xw = (Xnd + 1) * width/2 + X
if region is None: if region is None:
region = (0, 0, self.width() * self.devicePixelRatio(), self.height() * self.devicePixelRatio()) dpr = self.devicePixelRatio()
region = (0, 0, self.width() * dpr, self.height() * dpr)
x0, y0, w, h = self.getViewport() x0, y0, w, h = self.getViewport()
dist = self.opts['distance'] dist = self.opts['distance']