Changeset 7694:aca9dad4183b

Timestamp:

12/13/07 22:23:56 (5 years ago)

Author:

Robert Bradshaw <robertwb@…>

Branch:

default

Message:

Cmd line 3d viewer, plot3d sums starting with 0
One can now do sum(list_of_objects)

Location:

sage/plot/plot3d

Files:

• all.py (added)
• base.pyx (modified) (3 diffs)

sage/plot/plot3d/base.pyx

@@ -44 +44 @@
 
 
+import os
 from math import atan2
+
+from sage.plot.plot import EMBEDDED_MODE, DOCTEST_MODE
+import sage.misc.misc
 
 from sage.modules.free_module_element import vector
@@ -65 +69 @@
 
     def __add__(self, other):
+        if other is 0 or other is None:
+            return self
+        elif self is 0 or self is None:
+            return other
         return Graphics3dGroup([self, other])
         
@@ -180 +188 @@
             return self.transform(T=T)
             
-    def show(self, interactive=True, filename="shape", verbosity=0):
+    def show(self, filename="shape", verbosity=0):
+        if DOCTEST_MODE:
+            filename = sage.misc.misc.SAGE_TMP + "/tmp"
         tachyon_rt(self.tachyon(), filename+".png", verbosity, True, '')
-        if interactive:
-            f = open(filename+".obj", "w")
-            f.write("mtllib %s.mtl\n" % filename)
-            f.write(self.obj())
-            f.close()
-            f = open(filename+".mtl", "w")
-            f.write(self.mtl_str())
-            f.close()
+        f = open(filename+".obj", "w")
+        f.write("mtllib %s.mtl\n" % filename)
+        f.write(self.obj())
+        f.close()
+        f = open(filename+".mtl", "w")
+        f.write(self.mtl_str())
+        f.close()
+        if not DOCTEST_MODE and not EMBEDDED_MODE:
+            viewer = sage.misc.misc.SAGE_EXTCODE + "/notebook/java/3d/start_viewer"
+            os.system("%s %s.obj 2>/dev/null 1>/dev/null &"%(viewer, filename))