From: <ha...@us...> - 2010-07-30 07:38:54
|
Revision: 13748 http://jmol.svn.sourceforge.net/jmol/?rev=13748&view=rev Author: hansonr Date: 2010-07-30 07:38:48 +0000 (Fri, 30 Jul 2010) Log Message: ----------- version=12.0.2 # bug fix: print write("ramachandran") Modified Paths: -------------- branches/v12_0/Jmol/src/org/jmol/script/ScriptEvaluator.java branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties Modified: branches/v12_0/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- branches/v12_0/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-07-30 07:37:07 UTC (rev 13747) +++ branches/v12_0/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-07-30 07:38:48 UTC (rev 13748) @@ -8512,7 +8512,7 @@ if (isReturnOnly) statement = args; int tokCmd = (isReturnOnly ? Token.show : args[0].tok); - int pt0 = (tokCmd == Token.quaternion || tokCmd == Token.ramachandran ? 0 + int pt0 = (isReturnOnly || tokCmd == Token.quaternion || tokCmd == Token.ramachandran ? 0 : 1); String filename = null; boolean makeNewFrame = true; @@ -8531,9 +8531,9 @@ break; case Token.write: makeNewFrame = false; - if (tokAt(pt) == Token.string) { + if (tokAt(pt, args) == Token.string) { filename = stringParameter(pt--); - } else if (tokAt(pt - 1) == Token.per) { + } else if (tokAt(pt - 1, args) == Token.per) { filename = parameterAsString(pt - 2) + "." + parameterAsString(pt); pt -= 3; } else { @@ -8557,7 +8557,10 @@ Point3f minXYZ = null; Point3f maxXYZ = null; int plotType = 0; - switch (tokAt(pt0)) { + int tok = tokAt(pt0, args); + if (tok == Token.string) + tok = Token.getTokFromName((String)args[pt0].value); + switch (tok) { case Token.quaternion: case Token.helix: plotType = JmolConstants.JMOL_DATA_QUATERNION; @@ -12830,7 +12833,9 @@ case Token.quaternion: case Token.ramachandran: case Token.property: - msg = plot(statement); + msg = plot(args); + if (!isCommand) + return msg; break; case Token.pointgroup: type = "PGRP"; Modified: branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties 2010-07-30 07:37:07 UTC (rev 13747) +++ branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties 2010-07-30 07:38:48 UTC (rev 13748) @@ -4,6 +4,7 @@ version=12.0.2 +# bug fix: print write("ramachandran") # bug fix: reading background images from PNG images within zip files # bug fix: write xxxx.jmol zip sets cannot be read # bug fix: binary surface readers map and ccp4 can misread file type This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |