From: Michael T H. <mic...@us...> - 2004-03-24 13:45:35
|
Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/datamodel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26812/src/org/openscience/jmol/viewer/datamodel Modified Files: Atom.java Frame.java Log Message: changed occupancy to be an int at the ModelAdapter level Index: Atom.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/datamodel/Atom.java,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- Atom.java 19 Mar 2004 02:12:26 -0000 1.39 +++ Atom.java 24 Mar 2004 13:34:57 -0000 1.40 @@ -62,7 +62,7 @@ byte elementNumber, String atomName, int atomicCharge, - float occupancy, + int occupancy, float bfactor, float x, float y, float z, PdbFile pdbFile, String pdbAtomRecord) { @@ -72,9 +72,11 @@ this.modelNumber = (short)modelNumber; this.elementNumber = elementNumber; this.chargeAndFlags = (byte)(atomicCharge << 4); - this.occupancy = (occupancy == Float.NaN || occupancy >= 1.0f - ? (byte) 100 - : (occupancy <= 0 ? (byte)0 : (byte)(occupancy * 100))); + this.occupancy = (occupancy < 0 + ? (byte)0 + : (occupancy > 100 + ? (byte)100 + : (byte)occupancy)); this.bfactor100 = (bfactor == Float.NaN ? Short.MIN_VALUE : (short)(bfactor*100)); this.atomName = atomName; Index: Frame.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/datamodel/Frame.java,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- Frame.java 21 Mar 2004 23:16:39 -0000 1.80 +++ Frame.java 24 Mar 2004 13:34:57 -0000 1.81 @@ -118,7 +118,7 @@ byte atomicNumber, String atomName, int atomicCharge, - float occupancy, + int occupancy, float bfactor, float x, float y, float z, String pdbAtomRecord, |