[Jmol-commits] SF.net SVN: jmol:[11510] trunk/Jmol/src/org/jmol/viewer

[<ha...@us...>]

Revision: 11510
          http://jmol.svn.sourceforge.net/jmol/?rev=11510&view=rev
Author:   hansonr
Date:     2009-09-08 05:45:23 +0000 (Tue, 08 Sep 2009)

Log Message:
-----------
version=11.9.4_dev # new feature: write ZIP "xxx.zip" and write ZIPALL "xxx.zip"  
#  creates single-file package; added "ALL" includes remote files
# new feature: $SCRIPT_PATH$ prefix to file name uses path of script
#  file rather than default path
# bug fix: isosurface not retrieving exact reference for jvxl files in state

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/viewer/FileManager.java
    trunk/Jmol/src/org/jmol/viewer/JmolConstants.java
    trunk/Jmol/src/org/jmol/viewer/Viewer.java

Modified: trunk/Jmol/src/org/jmol/viewer/FileManager.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/FileManager.java	2009-09-08 05:39:57 UTC (rev 11509)
+++ trunk/Jmol/src/org/jmol/viewer/FileManager.java	2009-09-08 05:45:23 UTC (rev 11510)
@@ -1077,7 +1077,8 @@
     script = TextFormat.replaceQuotedStrings(script, fileNames, newFileNames);
     v.add(sname);
     v.add(script.getBytes());
-    Object bytes = viewer.getImageAs("JPEG", -1, -1, -1, null, null, script);
+    Object bytes = viewer.getImageAs("JPEG", -1, -1, -1, null, null, 
+        JmolConstants.embedScript(script));
     if (bytes instanceof byte[]) {
       v.add("Jmol" + id + ".jpg");
       v.add((byte[]) bytes);

Modified: trunk/Jmol/src/org/jmol/viewer/JmolConstants.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/JmolConstants.java	2009-09-08 05:39:57 UTC (rev 11509)
+++ trunk/Jmol/src/org/jmol/viewer/JmolConstants.java	2009-09-08 05:45:23 UTC (rev 11510)
@@ -88,6 +88,10 @@
 
   public final static String EMBEDDED_SCRIPT_TAG = "**** Jmol Embedded Script ****";
 
+  public static String embedScript(String s) {
+    return "\n/**" + EMBEDDED_SCRIPT_TAG + " \n" + s + "\n**/";
+  }
+  
   public static final String SCRIPT_EDITOR_IGNORE = "\0## EDITOR_IGNORE ##";
 
   public final static int CALLBACK_ANIMFRAME = 0;

Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Viewer.java	2009-09-08 05:39:57 UTC (rev 11509)
+++ trunk/Jmol/src/org/jmol/viewer/Viewer.java	2009-09-08 05:45:23 UTC (rev 11510)
@@ -6824,7 +6824,7 @@
       case 140:
         if (!global.imageState)
           return "";
-        return "\n/**" + JmolConstants.EMBEDDED_SCRIPT_TAG + " \n" + getStateInfo() + "\n**/";
+        return JmolConstants.embedScript(getStateInfo());
       case 160:
         return getSpaceGroupInfo(null);
       case 180:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.