Changeset 7953:f7c96aa4d21d

Timestamp:

01/04/08 02:51:33 (5 years ago)

Author:

William Stein <wstein@…>

Branch:

default

Parents:

7914:a644a3418d7b (diff), 7931:3acbc7485d58 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge

File:

• sage/plot/plot3d/shapes.pyx (modified) (2 diffs)

sage/plot/plot3d/shapes.pyx

@@ -207 +207 @@
         
         cdef double ratio = sqrt(rad*rad / ((base[0]-top[0])**2 + (base[1]-top[1])**2 + (base[2]-top[2])**2))
-        #print ratio
 
         if ratio > .02:
@@ -429 +428 @@
     def x3d_geometry(self):
         return "<Text string='%s' solid='true'/>"%self.string
+        
+    def jmol_repr(self, render_params):
+        cen = render_params.transform.transform_point((0,0,0))
+        render_params.atom_list.append(cen)
+        atom_no = len(render_params.atom_list)
+        return ['select atomno = %s' % atom_no,
+                self.get_texture().jmol_str("atom"),
+                'label "%s"' % self.string] #.replace('\n', '|')]
+                
+    def bounding_box(self):
+        return (0,0,0), (0,0,0)
+