From: <ha...@us...> - 2010-10-07 19:50:15
|
Revision: 14420 http://jmol.svn.sourceforge.net/jmol/?rev=14420&view=rev Author: hansonr Date: 2010-10-07 19:50:08 +0000 (Thu, 07 Oct 2010) Log Message: ----------- version=12.1.14 # new feature: "xxxx"%9999 == "to upper case"; "xXxX"%-9999 == "to lower case" Modified Paths: -------------- trunk/Jmol/src/org/jmol/modelsetbio/AminoPolymer.java trunk/Jmol/src/org/jmol/script/ScriptMathProcessor.java trunk/Jmol/src/org/jmol/viewer/Jmol.properties Modified: trunk/Jmol/src/org/jmol/modelsetbio/AminoPolymer.java =================================================================== --- trunk/Jmol/src/org/jmol/modelsetbio/AminoPolymer.java 2010-10-07 18:37:22 UTC (rev 14419) +++ trunk/Jmol/src/org/jmol/modelsetbio/AminoPolymer.java 2010-10-07 19:50:08 UTC (rev 14420) @@ -1172,14 +1172,16 @@ for (int i = 1; i < 3; i++) for (int j = 3 - i; j < 6; j++) { // skip 1/1 -- that would be a perfect ladder if (checkBridge(bridge, htBridges, isAntiparallel, i * dir, j * dir1)) - markBulgeResidues(bridge, i - 1, j - 1, dir, dir1, bsEEE); + markBulgeResidues(bridge, i, j, dir, dir1, bsEEE); if (i == 1 || j > 2) // skip 2/1 and 2/2 since we have done those already if (checkBridge(bridge, htBridges, isAntiparallel, j * dir, i * dir1)) - markBulgeResidues(bridge, j - 1, i - 1, dir, dir1, bsEEE); + markBulgeResidues(bridge, j, i, dir, dir1, bsEEE); } } private static void markBulgeResidues(Atom[] bridge, int ni, int nj, int dir, int dir1, BitSet bsEEE) { + bsEEE.set(bridge[0].index); // in case it is just a B + bsEEE.set(bridge[1].index); for (int i = 1; i <= ni; i++) bsEEE.set(bridge[0].getOffsetResidueAtom("0", i * dir)); for (int i = 1; i <= nj; i++) Modified: trunk/Jmol/src/org/jmol/script/ScriptMathProcessor.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptMathProcessor.java 2010-10-07 18:37:22 UTC (rev 14419) +++ trunk/Jmol/src/org/jmol/script/ScriptMathProcessor.java 2010-10-07 19:50:08 UTC (rev 14420) @@ -2852,7 +2852,11 @@ s = (String) x1.value; if (n == 0) return addX(TextFormat.trim(s, "\n\t ")); - else if (n > 0) + if (n == 9999) + return addX(s.toUpperCase()); + if (n == -9999) + return addX(s.toLowerCase()); + if (n > 0) return addX(TextFormat.format(s, n, n, false, false)); return addX(TextFormat.format(s, -n, n, true, false)); case Token.list: Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2010-10-07 18:37:22 UTC (rev 14419) +++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2010-10-07 19:50:08 UTC (rev 14420) @@ -3,6 +3,7 @@ version=12.1.14 +# new feature: "xxxx"%9999 == "to upper case"; "xXxX"%-9999 == "to lower case" # bug fix: undocumented save STRUCTURE not working for initial structure state # code: removal of unnecessary structure class in ModelCollection This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |