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

Revert "restore opts['viewport'] after clobbering"

Browse Source 
This reverts commit 7a17cda956.
This commit is contained in:
KIU Shueng Chuan 2021-07-17 18:25:06 +08:00
parent 7a17cda956
commit 6ca81fdddb
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pyqtgraph/opengl/GLViewWidget.py
View File

@ -550,7 +550,6 @@ class GLViewWidget(QtWidgets.QOpenGLWidget):
glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, texwidth, texwidth) glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, texwidth, texwidth)
glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, depth_buf) glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, depth_buf)
viewport_orig = self.opts['viewport']
self.opts['viewport'] = (0, 0, w, h) # viewport is the complete image; this ensures that paintGL(region=...) self.opts['viewport'] = (0, 0, w, h) # viewport is the complete image; this ensures that paintGL(region=...)
# is interpreted correctly. # is interpreted correctly.
p2 = 2 * padding p2 = 2 * padding
@ -573,7 +572,7 @@ class GLViewWidget(QtWidgets.QOpenGLWidget):
output[x+padding:x2-padding, y+padding:y2-padding] = data[padding:w2-padding, -(h2-padding):-padding] output[x+padding:x2-padding, y+padding:y2-padding] = data[padding:w2-padding, -(h2-padding):-padding]
finally: finally:
self.opts['viewport'] = viewport_orig self.opts['viewport'] = None
glfbo.glBindFramebuffer(glfbo.GL_FRAMEBUFFER, 0) glfbo.glBindFramebuffer(glfbo.GL_FRAMEBUFFER, 0)
glBindTexture(GL_TEXTURE_2D, 0) glBindTexture(GL_TEXTURE_2D, 0)
if tex is not None: if tex is not None: