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

fail upfront for OpenGL ES instead of during item add

Browse Source
This commit is contained in:
KIU Shueng Chuan 2021-07-17 13:30:20 +08:00
parent f698ccc06e
commit 1814ff535d
1 changed files with 9 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
pyqtgraph/opengl/GLViewWidget.py
View File

@ -97,14 +97,9 @@ class GLViewWidget(QtWidgets.QOpenGLWidget):
self.items.append(item) self.items.append(item)
if self.isValid(): if self.isValid():
self.makeCurrent()
try:
item.initialize() item.initialize()
except:
self.checkOpenGLVersion('Error while adding item %s to GLViewWidget.' % str(item))
item._setView(self) item._setView(self)
#print "set view", item, self, item.view()
self.update() self.update()
def removeItem(self, item): def removeItem(self, item):
@ -128,6 +123,14 @@ class GLViewWidget(QtWidgets.QOpenGLWidget):
""" """
Initialize items that were not initialized during addItem(). Initialize items that were not initialized during addItem().
""" """
ctx = self.context()
fmt = ctx.format()
if ctx.isOpenGLES() or fmt.version() < (2, 0):
verString = glGetString(GL_VERSION)
raise RuntimeError(
"pyqtgraph.opengl: Requires >= OpenGL 2.0 (not ES); Found %s" % verString
)
for item in self.items: for item in self.items:
if not item.isInitialized(): if not item.isInitialized():
item.initialize() item.initialize()
@ -523,36 +526,6 @@ class GLViewWidget(QtWidgets.QOpenGLWidget):
else: else:
self.keyTimer.stop() self.keyTimer.stop()
def checkOpenGLVersion(self, msg):
"""
Give exception additional context about version support.
Only to be called from within exception handler.
As this check is only performed on error,
unsupported versions might still work!
"""
# Check for unsupported version
verString = glGetString(GL_VERSION)
ver = verString.split()[0]
# If not OpenGL ES...
if str(ver.split(b'.')[0]).isdigit():
verNumber = int(ver.split(b'.')[0])
# ...and version is supported:
if verNumber >= 2:
# OpenGL version is fine, raise the original exception
raise
# Print original exception
from .. import debug
debug.printExc()
# Notify about unsupported version
raise Exception(
msg + "\n" + \
"pyqtgraph.opengl: Requires >= OpenGL 2.0 (not ES); Found %s" % verString
)
def readQImage(self): def readQImage(self):
""" """
Read the current buffer pixels out as a QImage. Read the current buffer pixels out as a QImage.