Changeset 7909:571786b64c45

Timestamp:

01/03/08 03:24:43 (5 years ago)

Author:

Robert Bradshaw <robertwb@…>

Branch:

default

Children:

7910:92d37861c2ce, 7921:bc8c4b756d60

Message:

Store all jmol files in a single zip archive.

Location:

sage

Files:

• plot/plot3d/base.pyx (modified) (4 diffs)
• plot/plot3d/index_face_set.pyx (modified) (1 diff)
• server/notebook/cell.py (modified) (1 diff)

sage/plot/plot3d/base.pyx

@@ -47 +47 @@
 from math import atan2
 from random import randint
+import zipfile
+from cStringIO import StringIO
 
 import sage.misc.misc
@@ -187 +189 @@
         render_params.output_file = filename
         render_params.force_reload = render_params.randomize_counter = force_reload
-        f = open(filename, 'w')
+        render_params.output_archive = zipfile.ZipFile(filename, 'w', zipfile.ZIP_DEFLATED, True)
+        
+        f = StringIO()
+        
         # Set the scene background color
         f.write('background [%s,%s,%s]\n'%tuple([int(a*255) for a in background]))
@@ -209 +214 @@
         # Put the rest of the object in
         f.write("\n".join(flatten_list([self.jmol_repr(render_params), ""])))
-        f.close()
+        
+        render_params.output_archive.writestr('SCRIPT', f.getvalue())
+        render_params.output_archive.close()
 
     def jmol_repr(self, render_params):
@@ -344 +351 @@
             #    fg = 2
             filename = '%s-size%s%s'%(base, fg*100, ext)
+            ext = "jmol"
+            archive_name = "%s.%s.zip" % (filename, ext)
 
             T = self._prepare_for_jmol(frame, axes, aspect_ratio, zoom)
-            T.export_jmol(filename + ".jmol", force_reload=EMBEDDED_MODE, **kwds)
+            T.export_jmol(archive_name, force_reload=EMBEDDED_MODE, **kwds)
             viewer_app = sage.misc.misc.SAGE_LOCAL + "/java/jmol/jmol"
-            ext = "jmol"
+
+            # We need a script to load the file
+            f = open(filename + '.jmol', 'w')
+            f.write('set defaultdirectory "%s"\n' % archive_name)
+            f.write('script SCRIPT\n')
+            f.close()
 
         if ext is None:

sage/plot/plot3d/index_face_set.pyx

@@ -643 +643 @@
         from base import flatten_list
         name = render_params.unique_name('obj')
-        filename = "%s-%s.pmesh" % (render_params.output_file, name)
-        f = open(filename, 'w')
         all = flatten_list(all)
-        for line in all:
-            f.write(line)
-            f.write('\n')
-        f.close()
-        #if render_params.force_reload:
-        #    filename += "?%s" % randint(1,1000000)
+        if render_params.output_archive:
+            filename = "%s.pmesh" % (name)
+            render_params.output_archive.writestr(filename, '\n'.join(all))
+        else:
+            filename = "%s-%s.pmesh" % (render_params.output_file, name)
+            f = open(filename, 'w')
+            for line in all:
+                f.write(line)
+                f.write('\n')
+            f.close()
 
         s = 'pmesh %s "%s"\n%s' % (name, filename, self.texture.jmol_str("pmesh"))

sage/server/notebook/cell.py

@@ -608 +608 @@
                 script = '<div><script>jmol_applet(%s, "%s");</script></div>' % (size, url)
                 images.append(script)
-            elif F.endswith('.pmesh'):
+            elif F.endswith('.jmol.zip'):
                 pass # jmol data
             else: