Ticket #3853: trac_3853-fixes.2.patch

a/sage/plot/all.py

@@ -1 @@
-polygon, plot, point, points
+line2d, polygon, plot, point, points, point2d
-                  text, circle, disk, hue, graphics_array, 
-                  list_plot, networkx_plot, parametric_plot,
-                  polar_plot, contour_plot, implicit_plot, arrow,

a/sage/plot/plot.py

@@ -2333 +2333 @@
-            sage: E = EllipticCurve('37a')
-            sage: P = E(0,0)
-            sage: def get_points(n):
-.:
+
-            sage: sum([get_points(15*n).plot3d(z=n) for n in range(1,10)])
-        """
-        from sage.plot.plot3d.base import Graphics3dGroup
@@ -2665 +2665 @@
-            pass
-    
-    if len(points)>0 and len(list(points[0]))!=2:
-        print points
-        raise ValueError, "points must have 2 coordinates in a 2d line"
-
-    
@@ -2947 +2946 @@
-    return contour_plot(f, xrange, yrange, **options)
-
-def line(points, **kwds):
+    """
+    Returns either a 2-dimensional or 3-dimensional line depending
+    on value of points.
+
+    For information regarding additional arguments, see either line2d?
+    or line3d?.
+
+    EXAMPLES:
+        sage: line([(0,0), (1,1)])
+        sage: line([(0,0,1), (1,1,1)])
+    """
+    try:
+        return line2d(points, **kwds)
+    except ValueError:
+        from sage.plot.plot3d.shapes2 import line3d
+        return line3d(points, **kwds)
+
+def line2d(points, **kwds):
-    r"""
-    Create the line through the given list of points.
-    
@@ -3212 +3229 @@
-    return g
-
-def point(points, **kwds):
+    """
+    Returns either a 2-dimensional or 3-dimensional point depending
+    on value of points.
+
+    For information regarding additional arguments, see either point2d?
+    or point3d?.
+
+    EXAMPLES:
+        sage: point([(0,0), (1,1)])
+        sage: point([(0,0,1), (1,1,1)])
+    """
+    try:
+        return point2d(points, **kwds)
+    except ValueError:
+        from sage.plot.plot3d.shapes2 import point3d
+        return point3d(points, **kwds)
+
+
+def point2d(points, **kwds):
-    r"""
-    
-    A point of size `pointsize' defined by point = $(x,y)$.
@@ -3629 +3665 @@
-        sage: text("Sage is really neat!!",(2,12))
-
-    The same text in larger font and colored red:
-3d
+
-
-    Some text but guaranteed to be in the lower left no matter what:
-        sage: text("Sage is really neat!!",(0,0), axis_coords=True, horizontal_alignment='left')