Minor fixes for py3k
This commit is contained in:
parent
6e253e409b
commit
f2d0991102
@ -1,13 +1,12 @@
|
||||
import sys, os, subprocess, time
|
||||
|
||||
try:
|
||||
from . import initExample
|
||||
except ValueError:
|
||||
#__package__ = os.path.split(os.path.dirname(__file__))[-1]
|
||||
sys.excepthook(*sys.exc_info())
|
||||
print("examples/ can not be executed as a script; please run 'python -m examples' instead.")
|
||||
sys.exit(1)
|
||||
if __name__ == "__main__" and (__package__ is None or __package__==''):
|
||||
parent_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
sys.path.insert(0, parent_dir)
|
||||
import examples
|
||||
__package__ = "examples"
|
||||
|
||||
from . import initExample
|
||||
from pyqtgraph.Qt import QtCore, QtGui, USE_PYSIDE
|
||||
|
||||
if USE_PYSIDE:
|
||||
|
@ -5,6 +5,7 @@ Copyright 2010 Luke Campagnola
|
||||
Distributed under MIT/X11 license. See license.txt for more infomation.
|
||||
"""
|
||||
|
||||
from __future__ import division
|
||||
from .python2_3 import asUnicode
|
||||
Colors = {
|
||||
'b': (0,0,255,255),
|
||||
@ -1864,9 +1865,9 @@ def isosurface(data, level):
|
||||
for i in [0,1,2]:
|
||||
vim = vertexInds[:,3] == i
|
||||
vi = vertexInds[vim, :3]
|
||||
viFlat = (vi * (np.array(data.strides[:3]) / data.itemsize)[np.newaxis,:]).sum(axis=1)
|
||||
viFlat = (vi * (np.array(data.strides[:3]) // data.itemsize)[np.newaxis,:]).sum(axis=1)
|
||||
v1 = dataFlat[viFlat]
|
||||
v2 = dataFlat[viFlat + data.strides[i]/data.itemsize]
|
||||
v2 = dataFlat[viFlat + data.strides[i]//data.itemsize]
|
||||
vertexes[vim,i] += (level-v1) / (v2-v1)
|
||||
|
||||
### compute the set of vertex indexes for each face.
|
||||
@ -1892,7 +1893,7 @@ def isosurface(data, level):
|
||||
#p = debug.Profiler('isosurface', disabled=False)
|
||||
|
||||
## this helps speed up an indexing operation later on
|
||||
cs = np.array(cutEdges.strides)/cutEdges.itemsize
|
||||
cs = np.array(cutEdges.strides)//cutEdges.itemsize
|
||||
cutEdges = cutEdges.flatten()
|
||||
|
||||
## this, strangely, does not seem to help.
|
||||
|
@ -932,8 +932,8 @@ class ObjectProxy(object):
|
||||
def __ilshift__(self, *args):
|
||||
return self._getSpecialAttr('__ilshift__')(*args, _callSync='off')
|
||||
|
||||
def __eq__(self, *args):
|
||||
return self._getSpecialAttr('__eq__')(*args)
|
||||
#def __eq__(self, *args):
|
||||
# return self._getSpecialAttr('__eq__')(*args)
|
||||
|
||||
def __ne__(self, *args):
|
||||
return self._getSpecialAttr('__ne__')(*args)
|
||||
|
@ -139,7 +139,7 @@ class GLViewWidget(QtOpenGL.QGLWidget):
|
||||
else:
|
||||
items = item.childItems()
|
||||
items.append(item)
|
||||
items.sort(lambda a,b: cmp(a.depthValue(), b.depthValue()))
|
||||
items.sort(key=lambda x: x.depthValue())
|
||||
for i in items:
|
||||
if not i.visible():
|
||||
continue
|
||||
@ -154,7 +154,7 @@ class GLViewWidget(QtOpenGL.QGLWidget):
|
||||
ver = glGetString(GL_VERSION)
|
||||
if ver is not None:
|
||||
ver = ver.split()[0]
|
||||
if int(ver.split('.')[0]) < 2:
|
||||
if int(ver.split(b'.')[0]) < 2:
|
||||
print(msg + " The original exception is printed above; however, pyqtgraph requires OpenGL version 2.0 or greater for many of its 3D features and your OpenGL version is %s. Installing updated display drivers may resolve this issue." % ver)
|
||||
else:
|
||||
print(msg)
|
||||
|
@ -23,8 +23,8 @@ from pyqtgraph import importAll
|
||||
|
||||
importAll('items', globals(), locals())
|
||||
\
|
||||
from MeshData import MeshData
|
||||
from .MeshData import MeshData
|
||||
## for backward compatibility:
|
||||
#MeshData.MeshData = MeshData ## breaks autodoc.
|
||||
|
||||
import shaders
|
||||
from . import shaders
|
||||
|
@ -83,7 +83,7 @@ class GLLinePlotItem(GLGraphicsItem):
|
||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
|
||||
glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
|
||||
|
||||
glDrawArrays(GL_LINE_STRIP, 0, self.pos.size / self.pos.shape[-1])
|
||||
glDrawArrays(GL_LINE_STRIP, 0, int(self.pos.size / self.pos.shape[-1]))
|
||||
finally:
|
||||
glDisableClientState(GL_VERTEX_ARRAY)
|
||||
|
||||
|
@ -146,7 +146,7 @@ class GLScatterPlotItem(GLGraphicsItem):
|
||||
else:
|
||||
glNormal3f(self.size, 0, 0) ## vertex shader uses norm.x to determine point size
|
||||
#glPointSize(self.size)
|
||||
glDrawArrays(GL_POINTS, 0, pos.size / pos.shape[-1])
|
||||
glDrawArrays(GL_POINTS, 0, int(pos.size / pos.shape[-1]))
|
||||
finally:
|
||||
glDisableClientState(GL_NORMAL_ARRAY)
|
||||
glDisableClientState(GL_VERTEX_ARRAY)
|
||||
|
@ -1,5 +1,5 @@
|
||||
from OpenGL.GL import *
|
||||
from GLMeshItem import GLMeshItem
|
||||
from .GLMeshItem import GLMeshItem
|
||||
from .. MeshData import MeshData
|
||||
from pyqtgraph.Qt import QtGui
|
||||
import pyqtgraph as pg
|
||||
|
@ -354,7 +354,7 @@ class ShaderProgram(object):
|
||||
|
||||
def uniform(self, name):
|
||||
"""Return the location integer for a uniform variable in this program"""
|
||||
return glGetUniformLocation(self.program(), name)
|
||||
return glGetUniformLocation(self.program(), bytes(name,'utf_8'))
|
||||
|
||||
#def uniformBlockInfo(self, blockName):
|
||||
#blockIndex = glGetUniformBlockIndex(self.program(), blockName)
|
||||
|
@ -128,7 +128,7 @@ class Renderer(GraphicsView):
|
||||
self.shm = mmap.mmap(-1, mmap.PAGESIZE, self.shmtag) # use anonymous mmap on windows
|
||||
else:
|
||||
self.shmFile = tempfile.NamedTemporaryFile(prefix='pyqtgraph_shmem_')
|
||||
self.shmFile.write('\x00' * mmap.PAGESIZE)
|
||||
self.shmFile.write(b'\x00' * (mmap.PAGESIZE+1))
|
||||
fd = self.shmFile.fileno()
|
||||
self.shm = mmap.mmap(fd, mmap.PAGESIZE, mmap.MAP_SHARED, mmap.PROT_WRITE)
|
||||
atexit.register(self.close)
|
||||
|
Loading…
Reference in New Issue
Block a user