From: <ha...@us...> - 2011-05-17 15:14:10
|
Revision: 15483 http://jmol.svn.sourceforge.net/jmol/?rev=15483&view=rev Author: hansonr Date: 2011-05-17 15:14:04 +0000 (Tue, 17 May 2011) Log Message: ----------- version=12.1.48_dev # bug fix: x = write("VRML") should give VRML contents and not write to disk Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java trunk/Jmol/src/org/jmol/viewer/Jmol.properties Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2011-05-17 15:13:17 UTC (rev 15482) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2011-05-17 15:14:04 UTC (rev 15483) @@ -13425,7 +13425,8 @@ pt++; type = type.substring(0, 1).toUpperCase() + type.substring(1); isExport = true; - fileName = "Jmol." + type; + if (isCommand) + fileName = "Jmol." + type; } else if (type.equals("menu")) { pt++; type = "MENU"; @@ -13575,7 +13576,7 @@ // todo -- there's no reason this data has to be done this way. // we could send all of them out to file directly fullPath[0] = fileName; - data = viewer.generateOutput(data, fullPath, width, height); + data = viewer.generateOutput(data, isCommand || fileName != null ? fullPath : null, width, height); if (data == null || data.length() == 0) return ""; if (!isCommand) Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2011-05-17 15:13:17 UTC (rev 15482) +++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2011-05-17 15:14:04 UTC (rev 15483) @@ -3,6 +3,8 @@ version=12.1.48_dev +# bug fix: x = write("VRML") should give VRML contents and not write to disk + # new feature: MO POINTS / AO POINTS mapping onto a plane # for (var i = -5;i < 5;i += 0.2) {isosurface plane x= @i map atomicorbital 4 3 1 points 1000;refresh} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |