From: <ha...@us...> - 2009-06-16 21:34:16
|
Revision: 11040 http://jmol.svn.sourceforge.net/jmol/?rev=11040&view=rev Author: hansonr Date: 2009-06-16 21:33:42 +0000 (Tue, 16 Jun 2009) Log Message: ----------- version=11.7.42_dev # default change: load trajectory "myfile.top" COORD {first,last,stride} "mdcrd::myfile.trj" defaults to last = -1 ("load all trajectories") not "load one trajectory" Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Jmol.properties trunk/Jmol/src/org/jmol/viewer/ScriptEvaluator.java Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2009-06-16 21:07:07 UTC (rev 11039) +++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2009-06-16 21:33:42 UTC (rev 11040) @@ -3,6 +3,7 @@ version=11.7.42_dev +# default change: load trajectory "myfile.top" COORD {first,last,stride} "mdcrd::myfile.trj" defaults to last = -1 ("load all trajectories") not "load one trajectory" # bug fix: gzipped gzip file not read properly. (Jmol-FAH files) # new feature: {*}.modelindex # Modified: trunk/Jmol/src/org/jmol/viewer/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/ScriptEvaluator.java 2009-06-16 21:07:07 UTC (rev 11039) +++ trunk/Jmol/src/org/jmol/viewer/ScriptEvaluator.java 2009-06-16 21:33:42 UTC (rev 11040) @@ -4535,7 +4535,8 @@ while (i < statementLength) { switch (tokAt(i)) { case Token.identifier: - if (parameterAsString(i).equalsIgnoreCase("filter")) { + String s = parameterAsString(i); + if (s.equalsIgnoreCase("filter")) { String filter = stringParameter(++i); htParams.put("filter", filter); loadScript.append(" FILTER ").append(Escape.escape(filter)); @@ -4548,7 +4549,7 @@ htParams.remove("isTrajectory"); if (firstLastSteps == null) { firstLastSteps = new Vector(); - pt = new Point3f(0, 0, 1); + pt = new Point3f(0, -1, 1); } if (isPoint3f(++i)) { pt = getPoint3f(i, false); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |