Merge pull request #503 from kiwi0fruit/patch-1
Fix bug in RawImageWidget.py
This commit is contained in:
commit
26d54e7cc0
@ -1,15 +1,24 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
"""
|
||||||
|
RawImageWidget.py
|
||||||
|
Copyright 2010-2016 Luke Campagnola
|
||||||
|
Distributed under MIT/X11 license. See license.txt for more infomation.
|
||||||
|
"""
|
||||||
|
|
||||||
from ..Qt import QtCore, QtGui
|
from ..Qt import QtCore, QtGui
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from ..Qt import QtOpenGL
|
from ..Qt import QtOpenGL
|
||||||
from OpenGL.GL import *
|
from OpenGL.GL import *
|
||||||
|
|
||||||
HAVE_OPENGL = True
|
HAVE_OPENGL = True
|
||||||
except Exception:
|
except (ImportError, AttributeError):
|
||||||
# Would prefer `except ImportError` here, but some versions of pyopengl generate
|
# Would prefer `except ImportError` here, but some versions of pyopengl generate
|
||||||
# AttributeError upon import
|
# AttributeError upon import
|
||||||
HAVE_OPENGL = False
|
HAVE_OPENGL = False
|
||||||
|
|
||||||
from .. import functions as fn
|
from .. import getConfigOption, functions as fn
|
||||||
import numpy as np
|
|
||||||
|
|
||||||
class RawImageWidget(QtGui.QWidget):
|
class RawImageWidget(QtGui.QWidget):
|
||||||
"""
|
"""
|
||||||
@ -17,11 +26,13 @@ class RawImageWidget(QtGui.QWidget):
|
|||||||
Generally using an ImageItem inside GraphicsView is fast enough.
|
Generally using an ImageItem inside GraphicsView is fast enough.
|
||||||
On some systems this may provide faster video. See the VideoSpeedTest example for benchmarking.
|
On some systems this may provide faster video. See the VideoSpeedTest example for benchmarking.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, parent=None, scaled=False):
|
def __init__(self, parent=None, scaled=False):
|
||||||
"""
|
"""
|
||||||
Setting scaled=True will cause the entire image to be displayed within the boundaries of the widget. This also greatly reduces the speed at which it will draw frames.
|
Setting scaled=True will cause the entire image to be displayed within the boundaries of the widget.
|
||||||
|
This also greatly reduces the speed at which it will draw frames.
|
||||||
"""
|
"""
|
||||||
QtGui.QWidget.__init__(self, parent=None)
|
QtGui.QWidget.__init__(self, parent)
|
||||||
self.setSizePolicy(QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding))
|
self.setSizePolicy(QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding))
|
||||||
self.scaled = scaled
|
self.scaled = scaled
|
||||||
self.opts = None
|
self.opts = None
|
||||||
@ -67,14 +78,18 @@ if HAVE_OPENGL:
|
|||||||
"""
|
"""
|
||||||
Similar to RawImageWidget, but uses a GL widget to do all drawing.
|
Similar to RawImageWidget, but uses a GL widget to do all drawing.
|
||||||
Perfomance varies between platforms; see examples/VideoSpeedTest for benchmarking.
|
Perfomance varies between platforms; see examples/VideoSpeedTest for benchmarking.
|
||||||
|
|
||||||
|
Checks if setConfigOptions(imageAxisOrder='row-major') was set.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, parent=None, scaled=False):
|
def __init__(self, parent=None, scaled=False):
|
||||||
QtOpenGL.QGLWidget.__init__(self, parent=None)
|
QtOpenGL.QGLWidget.__init__(self, parent)
|
||||||
self.scaled = scaled
|
self.scaled = scaled
|
||||||
self.image = None
|
self.image = None
|
||||||
self.uploaded = False
|
self.uploaded = False
|
||||||
self.smooth = False
|
self.smooth = False
|
||||||
self.opts = None
|
self.opts = None
|
||||||
|
self.row_major = getConfigOption('imageAxisOrder') == 'row-major'
|
||||||
|
|
||||||
def setImage(self, img, *args, **kargs):
|
def setImage(self, img, *args, **kargs):
|
||||||
"""
|
"""
|
||||||
@ -101,14 +116,19 @@ if HAVE_OPENGL:
|
|||||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER)
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER)
|
||||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER)
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER)
|
||||||
# glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_BORDER)
|
# glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_BORDER)
|
||||||
shape = self.image.shape
|
|
||||||
|
if self.row_major:
|
||||||
|
image = self.image
|
||||||
|
else:
|
||||||
|
image = self.image.transpose((1, 0, 2))
|
||||||
|
|
||||||
# ## Test texture dimensions first
|
# ## Test texture dimensions first
|
||||||
|
# shape = self.image.shape
|
||||||
# glTexImage2D(GL_PROXY_TEXTURE_2D, 0, GL_RGBA, shape[0], shape[1], 0, GL_RGBA, GL_UNSIGNED_BYTE, None)
|
# glTexImage2D(GL_PROXY_TEXTURE_2D, 0, GL_RGBA, shape[0], shape[1], 0, GL_RGBA, GL_UNSIGNED_BYTE, None)
|
||||||
# if glGetTexLevelParameteriv(GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH) == 0:
|
# if glGetTexLevelParameteriv(GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH) == 0:
|
||||||
# raise Exception("OpenGL failed to create 2D texture (%dx%d); too large for this hardware." % shape[:2])
|
# raise Exception("OpenGL failed to create 2D texture (%dx%d); too large for this hardware." % shape[:2])
|
||||||
|
|
||||||
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, shape[0], shape[1], 0, GL_RGBA, GL_UNSIGNED_BYTE, self.image.transpose((1,0,2)))
|
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, image.shape[1], image.shape[0], 0, GL_RGBA, GL_UNSIGNED_BYTE, image)
|
||||||
glDisable(GL_TEXTURE_2D)
|
glDisable(GL_TEXTURE_2D)
|
||||||
|
|
||||||
def paintGL(self):
|
def paintGL(self):
|
||||||
@ -128,16 +148,13 @@ if HAVE_OPENGL:
|
|||||||
glColor4f(1, 1, 1, 1)
|
glColor4f(1, 1, 1, 1)
|
||||||
|
|
||||||
glBegin(GL_QUADS)
|
glBegin(GL_QUADS)
|
||||||
glTexCoord2f(0,0)
|
|
||||||
glVertex3f(-1,-1,0)
|
|
||||||
glTexCoord2f(1,0)
|
|
||||||
glVertex3f(1, -1, 0)
|
|
||||||
glTexCoord2f(1,1)
|
|
||||||
glVertex3f(1, 1, 0)
|
|
||||||
glTexCoord2f(0, 1)
|
glTexCoord2f(0, 1)
|
||||||
|
glVertex3f(-1, -1, 0)
|
||||||
|
glTexCoord2f(1, 1)
|
||||||
|
glVertex3f(1, -1, 0)
|
||||||
|
glTexCoord2f(1, 0)
|
||||||
|
glVertex3f(1, 1, 0)
|
||||||
|
glTexCoord2f(0, 0)
|
||||||
glVertex3f(-1, 1, 0)
|
glVertex3f(-1, 1, 0)
|
||||||
glEnd()
|
glEnd()
|
||||||
glDisable(GL_TEXTURE_3D)
|
glDisable(GL_TEXTURE_3D)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user