From: <ha...@us...> - 2008-10-07 18:30:02
|
Revision: 10004 http://jmol.svn.sourceforge.net/jmol/?rev=10004&view=rev Author: hansonr Date: 2008-10-07 18:29:57 +0000 (Tue, 07 Oct 2008) Log Message: ----------- 11.7.1 version Modified Paths: -------------- trunk/Jmol/src/org/jmol/jvxl/readers/MrcBinaryReader.java Modified: trunk/Jmol/src/org/jmol/jvxl/readers/MrcBinaryReader.java =================================================================== --- trunk/Jmol/src/org/jmol/jvxl/readers/MrcBinaryReader.java 2008-10-07 18:00:38 UTC (rev 10003) +++ trunk/Jmol/src/org/jmol/jvxl/readers/MrcBinaryReader.java 2008-10-07 18:29:57 UTC (rev 10004) @@ -23,6 +23,8 @@ */ package org.jmol.jvxl.readers; +import org.jmol.api.Interface; +import org.jmol.api.SymmetryInterface; import org.jmol.util.BinaryDocument; import org.jmol.util.Logger; @@ -90,6 +92,7 @@ float rms; int nlabel; String[] labels = new String[10]; + SymmetryInterface unitCell; MrcHeader() { try { @@ -110,6 +113,9 @@ alpha = mrcDoc.readFloat(); beta = mrcDoc.readFloat(); gamma = mrcDoc.readFloat(); + + unitCell = (SymmetryInterface) Interface.getOptionInterface("symmetry.Symmetry"); + unitCell.setUnitCell(new float[] {a, b, c, alpha, beta, gamma} ); mapc = mrcDoc.readInt(); mapr = mrcDoc.readInt(); @@ -154,7 +160,9 @@ } protected void readAtomCountAndOrigin() { - atomCount = 0; + JvxlReader.jvxlCheckAtomLine(isXLowToHigh, isAngstroms, "0", + "0 " + (-mrcHeader.originX) + " " + (-mrcHeader.originY) + " " + (-mrcHeader.originZ), + jvxlFileHeaderBuffer); volumetricOrigin.set(-mrcHeader.originX, -mrcHeader.originY, -mrcHeader.originZ); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |