diff options
Diffstat (limited to 'silx/gui/_glutils')
| -rw-r--r-- | silx/gui/_glutils/OpenGLWidget.py | 48 | ||||
| -rw-r--r-- | silx/gui/_glutils/font.py | 6 |
2 files changed, 23 insertions, 31 deletions
diff --git a/silx/gui/_glutils/OpenGLWidget.py b/silx/gui/_glutils/OpenGLWidget.py index c5ece9c..1f7bfae 100644 --- a/silx/gui/_glutils/OpenGLWidget.py +++ b/silx/gui/_glutils/OpenGLWidget.py @@ -1,7 +1,7 @@ # coding: utf-8 # /*########################################################################## # -# Copyright (c) 2017-2019 European Synchrotron Radiation Facility +# Copyright (c) 2017-2020 European Synchrotron Radiation Facility # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -37,39 +37,25 @@ import logging import sys from .. import qt +from ..utils.glutils import isOpenGLAvailable from .._glutils import gl _logger = logging.getLogger(__name__) -# Probe OpenGL availability and widget -ERROR = '' # Error message from probing Qt OpenGL support -_BaseOpenGLWidget = None # Qt OpenGL widget to use - -if hasattr(qt, 'QOpenGLWidget'): # PyQt>=5.4 - _logger.info('Using QOpenGLWidget') - _BaseOpenGLWidget = qt.QOpenGLWidget - -elif not qt.HAS_OPENGL: # QtOpenGL not installed - ERROR = '%s.QtOpenGL not available' % qt.BINDING - -elif qt.QApplication.instance() and not qt.QGLFormat.hasOpenGL(): - # qt.QGLFormat.hasOpenGL MUST be called with a QApplication created - # so this is only checked if the QApplication is already created - ERROR = 'Qt reports OpenGL not available' +if not hasattr(qt, 'QOpenGLWidget') and not hasattr(qt, 'QGLWidget'): + OpenGLWidget = None else: - _logger.info('Using QGLWidget') - _BaseOpenGLWidget = qt.QGLWidget - + if hasattr(qt, 'QOpenGLWidget'): # PyQt>=5.4 + _logger.info('Using QOpenGLWidget') + _BaseOpenGLWidget = qt.QOpenGLWidget -# Internal class wrapping Qt OpenGL widget -if _BaseOpenGLWidget is None: - _logger.error('OpenGL-based widget disabled: %s', ERROR) - _OpenGLWidget = None + else: + _logger.info('Using QGLWidget') + _BaseOpenGLWidget = qt.QGLWidget -else: class _OpenGLWidget(_BaseOpenGLWidget): """Wrapper over QOpenGLWidget and QGLWidget""" @@ -119,7 +105,6 @@ else: # Enable receiving mouse move events when no buttons are pressed self.setMouseTracking(True) - def getDevicePixelRatio(self): """Returns the ratio device-independent / device pixel size @@ -285,9 +270,13 @@ class OpenGLWidget(qt.QWidget): layout.setContentsMargins(0, 0, 0, 0) self.setLayout(layout) - if _OpenGLWidget is None: + self.__context = None + + _check = isOpenGLAvailable(version=version, runtimeCheck=False) + if _OpenGLWidget is None or not _check: + _logger.error('OpenGL-based widget disabled: %s', _check.error) self.__openGLWidget = None - label = self._createErrorQLabel(ERROR) + label = self._createErrorQLabel(_check.error) self.layout().addWidget(label) else: @@ -370,7 +359,10 @@ class OpenGLWidget(qt.QWidget): if self.__openGLWidget is None: return None else: - return self.__openGLWidget.context() + # Keep a reference on QOpenGLContext to make + # else PyQt5 keeps creating a new one. + self.__context = self.__openGLWidget.context() + return self.__context def defaultFramebufferObject(self): """Returns the framebuffer object handle. diff --git a/silx/gui/_glutils/font.py b/silx/gui/_glutils/font.py index 8403c5a..6a4c489 100644 --- a/silx/gui/_glutils/font.py +++ b/silx/gui/_glutils/font.py @@ -1,7 +1,7 @@ # coding: utf-8 # /*########################################################################## # -# Copyright (c) 2016-2018 European Synchrotron Radiation Facility +# Copyright (c) 2016-2020 European Synchrotron Radiation Facility # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -128,8 +128,8 @@ def rasterText(text, font, width = bounds.width() * devicePixelRatio + 2 # align line size to 32 bits to ease conversion to numpy array width = 4 * ((width + 3) // 4) - image = qt.QImage(width, - bounds.height() * devicePixelRatio + 2, + image = qt.QImage(int(width), + int(bounds.height() * devicePixelRatio + 2), qt.QImage.Format_RGB888) if (devicePixelRatio != 1.0 and hasattr(image, 'setDevicePixelRatio')): # Qt 5 |