Changeset 7971:66ae86c46978

Timestamp:

01/05/08 05:03:25 (5 years ago)

Author:

Robert Bradshaw <robertwb@…>

Branch:

default

Message:

Tachyon points/lines

Location:

sage/plot/plot3d

Files:

• shapes2.py (modified) (5 diffs)
• transform.pyx (modified) (2 diffs)

sage/plot/plot3d/shapes2.py

@@ -9 +9 @@
 
 from texture import Texture
+
+TACHYON_PIXEL = 1/200.0
 
 from shapes import Text, Sphere
@@ -27 +29 @@
     if len(points) < 2:
         raise ValueError, "there must be at least 2 points"
+    for i in range(len(points)):
+        x, y, z = points[i]
+        points[i] = float(x), float(y), float(z)
     if radius is None:
         # make a zoom-invariant line
-        return Line(points, thickness=thickness, **kwds)
+        return Line(points, thickness=thickness, arrow_head=arrow_head, **kwds)
     else:
         v = []
@@ -231 +236 @@
     def __init__(self, (x,y,z), size=1, **kwds):
         PrimitiveObject.__init__(self, **kwds)
-        self.loc = x, y, z
+        self.loc = float(x), float(y), float(z)
         self.size = size
         
@@ -243 +248 @@
         else:
             cen = transform.transform_point(self.loc)
-        return "Sphere center %s %s %s Rad %s %s" % (cen[0], cen[1], cen[2], self.size, self.texture.id)
+        return "Sphere center %s %s %s Rad %s %s" % (cen[0], cen[1], cen[2], self.size * TACHYON_PIXEL, self.texture.id)
         
     def jmol_repr(self, render_params):
@@ -293 +298 @@
         cmds = []
         px, py, pz = self.points[0] if T is None else T(self.points[0])
+        radius = self.thickness * TACHYON_PIXEL
         for P in self.points[1:]:
             x, y, z = P if T is None else T(P)
-            cmds.append("FCylinder base %s %s %s apex %s %s %s rad %s %s" % (px, py, pz,
-                                                                             x, y, z,
-                                                                             self.thickness,
-                                                                             self.texture.id))
+            if self.arrow_head and P is self.points[-1]:
+                A = shapes.Arrow((px, py, pz), (x, y, z), radius = radius, texture = self.texture)
+                render_params.push_transform(~T)
+                cmds.append(A.tachyon_repr(render_params))
+                render_params.pop_transform()
+            else:
+                cmds.append("FCylinder base %s %s %s apex %s %s %s rad %s %s" % (px, py, pz,
+                                                                                 x, y, z,
+                                                                                 radius,
+                                                                                 self.texture.id))
             px, py, pz = x, y, z
-        print cmds
         return cmds
 

sage/plot/plot3d/transform.pyx

@@ -108 +108 @@
         return Transformation(m = self.matrix * other.matrix)
         
+    def __invert__(Transformation self):
+        return Transformation(m=~self.matrix)
+        
     def __call__(self, p):
         return self.transform_point(p)
@@ -115 +118 @@
             self._svd = self.matrix.submatrix(0,0,3,3).SVD()
         return self._svd[1][0,0]
+
+    def avg_scale(self):
+        if self._svd is None:
+            self._svd = self.matrix.submatrix(0,0,3,3).SVD()
+        return (self._svd[1][0,0] * self._svd[1][1,1] * self._svd[1][2,2]) ** (1/3.0)