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

change some deviceWidth() to width()

Browse Source 
viewport / region use device pixels: deviceWidth()
anywhere else uses device independent pixels : width()
This commit is contained in:
KIU Shueng Chuan 2021-07-17 15:45:06 +08:00
parent f43f795950
commit 5b2674c9d5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pyqtgraph/opengl/GLViewWidget.py
View File

@ -382,7 +382,7 @@ class GLViewWidget(QtWidgets.QOpenGLWidget):
cVec = self.opts['center'] - cPos cVec = self.opts['center'] - cPos
dist = cVec.length() ## distance from camera to center dist = cVec.length() ## distance from camera to center
xDist = dist * 2. * tan(0.5 * radians(self.opts['fov'])) ## approx. width of view at distance of center point xDist = dist * 2. * tan(0.5 * radians(self.opts['fov'])) ## approx. width of view at distance of center point
xScale = xDist / self.deviceWidth() xScale = xDist / self.width()
zVec = QtGui.QVector3D(0,0,1) zVec = QtGui.QVector3D(0,0,1)
xVec = QtGui.QVector3D.crossProduct(zVec, cVec).normalized() xVec = QtGui.QVector3D.crossProduct(zVec, cVec).normalized()
yVec = QtGui.QVector3D.crossProduct(xVec, zVec).normalized() yVec = QtGui.QVector3D.crossProduct(xVec, zVec).normalized()
@ -407,7 +407,7 @@ class GLViewWidget(QtWidgets.QOpenGLWidget):
fov = radians(self.opts['fov']) fov = radians(self.opts['fov'])
dist = (self.opts['center'] - self.cameraPosition()).length() dist = (self.opts['center'] - self.cameraPosition()).length()
fov_factor = tan(fov / 2) * 2 fov_factor = tan(fov / 2) * 2
scale_factor = dist * fov_factor / self.deviceWidth() scale_factor = dist * fov_factor / self.width()
z = scale_factor * cos(elev) * dy z = scale_factor * cos(elev) * dy
x = scale_factor * (sin(azim) * dx - sin(elev) * cos(azim) * dy) x = scale_factor * (sin(azim) * dx - sin(elev) * cos(azim) * dy)
y = scale_factor * (cos(azim) * dx + sin(elev) * sin(azim) * dy) y = scale_factor * (cos(azim) * dx + sin(elev) * sin(azim) * dy)
@ -429,7 +429,7 @@ class GLViewWidget(QtWidgets.QOpenGLWidget):
else: else:
dist = (pos-cam).length() dist = (pos-cam).length()
xDist = dist * 2. * tan(0.5 * radians(self.opts['fov'])) xDist = dist * 2. * tan(0.5 * radians(self.opts['fov']))
return xDist / self.deviceWidth() return xDist / self.width()
def mousePressEvent(self, ev): def mousePressEvent(self, ev):
lpos = ev.position() if hasattr(ev, 'position') else ev.localPos() lpos = ev.position() if hasattr(ev, 'position') else ev.localPos()