From: <ha...@us...> - 2011-01-03 16:28:06
|
Revision: 14940 http://jmol.svn.sourceforge.net/jmol/?rev=14940&view=rev Author: hansonr Date: 2011-01-03 16:27:59 +0000 (Mon, 03 Jan 2011) Log Message: ----------- version=12.0.27_dev # bug fix: (modelkit) load $PCl5; assign atom ({2}) "C" fails to place H atoms correctly Modified Paths: -------------- branches/v12_0/Jmol/src/org/jmol/modelset/AtomCollection.java branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties Modified: branches/v12_0/Jmol/src/org/jmol/modelset/AtomCollection.java =================================================================== --- branches/v12_0/Jmol/src/org/jmol/modelset/AtomCollection.java 2011-01-03 11:27:55 UTC (rev 14939) +++ branches/v12_0/Jmol/src/org/jmol/modelset/AtomCollection.java 2011-01-03 16:27:59 UTC (rev 14940) @@ -1542,11 +1542,17 @@ && attached[0].getBondedAtomIndex(i) != atom.index) { x.sub(attached[0], attached[0].bonds[i].getOtherAtom(attached[0])); x.cross(z, x); + if (x.length() == 0) + continue; x.cross(x, z); break; } } x.normalize(); + if (Float.isNaN(x.x)) { + x.set(vRef); + x.cross(x, z); + } // x is perp to bond vTemp.cross(z, x); vTemp.normalize(); Modified: branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties 2011-01-03 11:27:55 UTC (rev 14939) +++ branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties 2011-01-03 16:27:59 UTC (rev 14940) @@ -4,6 +4,7 @@ version=12.0.27_dev +# bug fix: (modelkit) load $PCl5; assign atom ({2}) "C" fails to place H atoms correctly # bug fix: isosurface sets not sorted by number of vertices # bug fix: logFile/logCommands/logGestures should not be saved in state # bug fix: log file cannot be turned off by setting value to "" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |