From: <ha...@us...> - 2006-12-10 02:30:30
|
Revision: 6433 http://svn.sourceforge.net/jmol/?rev=6433&view=rev Author: hansonr Date: 2006-12-09 18:30:29 -0800 (Sat, 09 Dec 2006) Log Message: ----------- fixes measure allconnected bug when middle atom is atom 0 Modified Paths: -------------- branches/v11_0/Jmol/src/org/jmol/viewer/Measures.java Modified: branches/v11_0/Jmol/src/org/jmol/viewer/Measures.java =================================================================== --- branches/v11_0/Jmol/src/org/jmol/viewer/Measures.java 2006-12-10 00:21:06 UTC (rev 6432) +++ branches/v11_0/Jmol/src/org/jmol/viewer/Measures.java 2006-12-10 02:30:29 UTC (rev 6433) @@ -242,10 +242,11 @@ int i = defined(atomCountPlusIndices); //Logger.debug("define " + isDelete + " " + i + " [" + atomCountPlusIndices[0] + " " + atomCountPlusIndices[1] + " " + atomCountPlusIndices[2] + " " + atomCountPlusIndices[3] + " " + atomCountPlusIndices[4] + "]"); // nothing to delete and no A-A, A-B-A, A-B-C-B - if (i < 0 && isDelete || atomCountPlusIndices[0] > 2 && ( - atomCountPlusIndices[1] == atomCountPlusIndices[2] || - atomCountPlusIndices[1] == atomCountPlusIndices[3] || - atomCountPlusIndices[2] == atomCountPlusIndices[4])) + int count = atomCountPlusIndices[0]; + if (i < 0 && isDelete + || atomCountPlusIndices[1] == atomCountPlusIndices[2] + || count > 2 && atomCountPlusIndices[1] == atomCountPlusIndices[3] + || count == 4 && atomCountPlusIndices[2] == atomCountPlusIndices[4]) return; float value; value = frame.getMeasurement(atomCountPlusIndices); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |