Changeset 7898:f2d02e4db6a9

Timestamp:

12/30/07 08:31:59 (5 years ago)

Author:

William Stein <wstein@…>

Branch:

default

Message:

3d -- Fix drawing of axes somewhat.

Location:

sage/plot/plot3d

Files:

• base.pyx (modified) (1 diff)
• bugs.txt (modified) (1 diff)

sage/plot/plot3d/base.pyx

@@ -249 +249 @@
     def _transform_to_bounding_box(self, xyz_min, xyz_max, frame, axes, thickness):
         a_min, a_max = self.bounding_box()
+
         # Rescale in each direction
-        scale = [(xyz_max[i] - xyz_min[i]) / max(0.001, a_max[i] - a_min[i]) for i in range(3)]
+        scale = [(xyz_max[i] - xyz_min[i]) / max(0.0001, a_max[i] - a_min[i]) for i in range(3)]
         X = self.scale(scale)
+        a_min, a_max = X.bounding_box()
+
+
         # Translate so lower left corner of original bounding box
         # is in the right spot
-        a_min, a_max = X.bounding_box()
-        if axes:
-            from shapes import LineSegment
-            X += LineSegment((min(0, a_min[0]*1.1), 0, 0), (max(0,a_max[0]*1.1), 0,0),
-                             thickness, color="blue")
-            X += LineSegment((0,min(0,a_min[1]*1.1), 0), (0, max(0,a_max[1]*1.1), 0),
-                             thickness, color="blue")
-            X += LineSegment((0, 0, min(0,a_min[2]*1.1)), (0, 0, max(0,a_max[2]*1.1)),
-                             thickness, color="blue")
-        Y = X.translate([xyz_min[i] - a_min[i] for i in range(3)])
-        a_min, a_max = Y.bounding_box()
+        T = [xyz_min[i] - a_min[i] for i in range(3)]
+        X = X.translate(T)
         if frame:
+            a_min, a_max = X.bounding_box()
             from shapes2 import frame3d
             F = frame3d(a_min, a_max, opacity=0.5, color=(0,0,0), thickness=thickness)
-            return Y + F
-        return Y
-
+            X += F
+
+        if axes:
+            # draw axes
+            from shapes import Arrow
+            A = (Arrow((min(0,a_min[0]),0, 0), (max(0,a_max[0]), 0,0),
+                             thickness, color="blue"),
+                 Arrow((0,min(0,a_min[1]), 0), (0, max(0,a_max[1]), 0),
+                             thickness, color="blue"), 
+                 Arrow((0, 0, min(0,a_min[2])), (0, 0, max(0,a_max[2])),
+                             thickness, color="blue"))
+            X += sum(A).translate([-z for z in T])
+
+        return X
 
     def show(self, viewer="jmol", filename=None, verbosity=0, figsize=5,

sage/plot/plot3d/bugs.txt

@@ -9 +9 @@
    then rescale everything into a 10x10x10 square. 
    We should draw axis and allow for aspect ratios. 
+ * Invalid color doesn't yield an error message, e.g., Icosahedron(texture="yello")
+ * color --> rgbcolor
 
 Jmol todo: