From: <ha...@us...> - 2007-06-30 16:07:57
|
Revision: 7923 http://svn.sourceforge.net/jmol/?rev=7923&view=rev Author: hansonr Date: 2007-06-30 09:07:52 -0700 (Sat, 30 Jun 2007) Log Message: ----------- 11.3.2 critical update bug fix # bug fix: set picking label # bug fix: minus-sign "fix" in 11.3.1 broke all {x -y z} notation # bug fix: state for phased atomic orbitals does not preserve red/blue color Modified Paths: -------------- trunk/Jmol/src/org/jmol/shapespecial/Isosurface.java trunk/Jmol/src/org/jmol/viewer/Eval.java trunk/Jmol/src/org/jmol/viewer/Jmol.properties Modified: trunk/Jmol/src/org/jmol/shapespecial/Isosurface.java =================================================================== --- trunk/Jmol/src/org/jmol/shapespecial/Isosurface.java 2007-06-30 01:10:22 UTC (rev 7922) +++ trunk/Jmol/src/org/jmol/shapespecial/Isosurface.java 2007-06-30 16:07:52 UTC (rev 7923) @@ -147,6 +147,7 @@ private int moNumber; private short defaultColix; private Point3f center; + private boolean isPhaseColored; protected SurfaceGenerator sg; private JvxlData jvxlData; @@ -256,8 +257,12 @@ center.set((Point3f) value); } - //surface generator only (return TRUE) or shared (return FALSE) + if ("phase" == propertyName) { + isPhaseColored = true; + } + //surface generator only (return TRUE) or shared (return FALSE) + if (sg.setParameter(propertyName, value, bs)) return; @@ -367,6 +372,7 @@ atomIndex = -1; defaultColix = 0; bsIgnore = null; + isPhaseColored = false; center = new Point3f(Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE); initState(); } @@ -546,6 +552,8 @@ if (thisMesh == null) allocMesh(null); thisMesh.clear("isosurface", sg.getIAddGridPoints(), thisMesh.showTriangles); + if (isPhaseColored) + thisMesh.isColorSolid = false; return; } switch (mode) { Modified: trunk/Jmol/src/org/jmol/viewer/Eval.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Eval.java 2007-06-30 01:10:22 UTC (rev 7922) +++ trunk/Jmol/src/org/jmol/viewer/Eval.java 2007-06-30 16:07:52 UTC (rev 7923) @@ -2364,6 +2364,7 @@ return (Point4f) getToken(index).value; invalidArgument(); } + int multiplier = 1; out: for (int i = index; i < statement.length; i++) { switch (getToken(i).tok) { case Token.leftbrace: @@ -2373,12 +2374,18 @@ break; case Token.rightbrace: break out; + case Token.spec_seqcode_range: + if (n == 6) + invalidArgument(); + coord[n++] = theToken.intValue; + multiplier = -1; + break; case Token.integer: - case Token.spec_seqcode_range: case Token.spec_seqcode: if (n == 6) invalidArgument(); - coord[n++] = theToken.intValue; + coord[n++] = theToken.intValue * multiplier; + multiplier = 1; break; case Token.slash: getToken(++i); Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2007-06-30 01:10:22 UTC (rev 7922) +++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2007-06-30 16:07:52 UTC (rev 7923) @@ -1,7 +1,9 @@ -version=11.3.2_dev +version=11.3.2 # bug fix: set picking label - +# bug fix: minus-sign "fix" in 11.3.1 broke all {x -y z} notation +# bug fix: state for phased atomic orbitals does not preserve red/blue color + # ----------------------------------------------------------------------------- #version=11.3.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |