From 79af643955fad84c968d6e74d5235f0f5d4b44c5 Mon Sep 17 00:00:00 2001
From: Luke Campagnola <luke.campagnola@gmail.com>
Date: Tue, 11 Feb 2014 13:59:09 -0500
Subject: [PATCH] Added Vector.angle method Inverted MeshData.cylinder normals
---
pyqtgraph/Vector.py | 15 +++++++++++++++
pyqtgraph/opengl/MeshData.py | 8 ++------
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/pyqtgraph/Vector.py b/pyqtgraph/Vector.py
index 4b4fb02f..b18b3091 100644
--- a/pyqtgraph/Vector.py
+++ b/pyqtgraph/Vector.py
@@ -67,4 +67,19 @@ class Vector(QtGui.QVector3D):
yield(self.x())
yield(self.y())
yield(self.z())
+
+ def angle(self, a):
+ """Returns the angle in degrees between this vector and the vector a."""
+ n1 = self.length()
+ n2 = a.length()
+ if n1 == 0. or n2 == 0.:
+ return None
+ ## Probably this should be done with arctan2 instead..
+ ang = np.arccos(np.clip(QtGui.QVector3D.dotProduct(self, a) / (n1 * n2), -1.0, 1.0)) ### in radians
+# c = self.crossProduct(a)
+# if c > 0:
+# ang *= -1.
+ return ang * 180. / np.pi
+
+
\ No newline at end of file
diff --git a/pyqtgraph/opengl/MeshData.py b/pyqtgraph/opengl/MeshData.py
index ae0fa4ca..ab2dfa41 100644
--- a/pyqtgraph/opengl/MeshData.py
+++ b/pyqtgraph/opengl/MeshData.py
@@ -242,7 +242,6 @@ class MeshData(object):
v = self.vertexes(indexed='faces')
self._faceNormals = np.cross(v[:,1]-v[:,0], v[:,2]-v[:,0])
-
if indexed is None:
return self._faceNormals
elif indexed == 'faces':
@@ -519,20 +518,17 @@ class MeshData(object):
return MeshData(vertexes=verts, faces=faces)
@staticmethod
- def cylinder(rows, cols, radius=[1.0, 1.0], length=1.0, offset=False, ends=False):
+ def cylinder(rows, cols, radius=[1.0, 1.0], length=1.0, offset=False):
"""
Return a MeshData instance with vertexes and faces computed
for a cylindrical surface.
The cylinder may be tapered with different radii at each end (truncated cone)
- ends are open if ends = False
- No closed ends implemented yet...
- The easiest way may be to add a vertex at the top and bottom in the center of the face?
"""
verts = np.empty((rows+1, cols, 3), dtype=float)
if isinstance(radius, int):
radius = [radius, radius] # convert to list
## compute vertexes
- th = ((np.arange(cols) * 2 * np.pi / cols).reshape(1, cols)) # angle around
+ th = np.linspace(2 * np.pi, 0, cols).reshape(1, cols)
r = (np.linspace(radius[0],radius[1],num=rows+1, endpoint=True)).reshape(rows+1, 1) # radius as a function of z
verts[...,2] = np.linspace(-length/2.0, length/2.0, num=rows+1, endpoint=True).reshape(rows+1, 1) # z
if offset:
--
GitLab