From: <ha...@us...> - 2007-02-28 02:09:53
|
Revision: 6987 http://svn.sourceforge.net/jmol/?rev=6987&view=rev Author: hansonr Date: 2007-02-27 18:09:51 -0800 (Tue, 27 Feb 2007) Log Message: ----------- 11.1.15 x = {a b c} fix Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Eval.java Modified: trunk/Jmol/src/org/jmol/viewer/Eval.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Eval.java 2007-02-27 22:36:12 UTC (rev 6986) +++ trunk/Jmol/src/org/jmol/viewer/Eval.java 2007-02-28 02:09:51 UTC (rev 6987) @@ -2245,6 +2245,16 @@ float[] coord = new float[6]; int n = 0; coordinatesAreFractional = implicitFractional; + if (tokAt(index) == Token.point3f) { + if (minDim<=3 && maxDim>=3) + return (Point3f) getToken(index).value; + invalidArgument(); + } + if (tokAt(index) == Token.point4f) { + if (minDim<=4 && maxDim>=4) + return (Point4f) getToken(index).value; + invalidArgument(); + } out: for (int i = index; i < statement.length; i++) { switch (getToken(i).tok) { case Token.leftbrace: @@ -5377,7 +5387,9 @@ } String str = ""; + boolean showing = (!isSyntaxCheck && scriptLevel <= scriptReportingLevel); + if (setParameter(key, val)) { if (isSyntaxCheck) return; @@ -5397,26 +5409,28 @@ } else if (v instanceof BondSet) { setIntProperty(key, Viewer.cardinalityOf((BitSet) v)); setStringProperty(key + "_set", StateManager.escape((BitSet) v, false)); - if (!isSyntaxCheck && scriptLevel <= scriptReportingLevel) + if (showing) viewer.showParameter(key+"_set", true, 60); } else if (v instanceof BitSet) { setIntProperty(key, Viewer.cardinalityOf((BitSet) v)); setStringProperty(key + "_set", StateManager.escape((BitSet) v)); - if (!isSyntaxCheck && scriptLevel <= scriptReportingLevel) + if (showing) viewer.showParameter(key+"_set", true, 60); } else if (v instanceof Point3f) { //drawPoint(key, (Point3f) v, false); str = StateManager.escape((Point3f) v); setStringProperty(key, str); - showString("to visualize, use DRAW @" + key); + if (showing) + showString("to visualize, use DRAW @" + key); } else if (v instanceof Point4f) { //drawPlane(key, (Point4f) v, false); str = StateManager.escape((Point4f) v); setStringProperty(key, str); - showString("to visualize, use ISOSURFACE PLANE @" + key); + if (showing) + showString("to visualize, use ISOSURFACE PLANE @" + key); } } - if (!isSyntaxCheck && !tQuiet && scriptLevel <= scriptReportingLevel) + if (showing) viewer.showParameter(key, true, 60); } @@ -5502,7 +5516,7 @@ } break; case Token.leftbrace: - v = getPointOrPlane(i, false, true, true, false, 4, 4); + v = getPointOrPlane(i, false, true, true, false, 3, 4); i = iToken; break; case Token.expressionBegin: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |