From: Fabian D. <fd...@us...> - 2003-06-03 20:38:31
|
Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol In directory sc8-pr-cvs1:/tmp/cvs-serv19317/src/org/openscience/jmol Modified Files: CrystalBox.java Log Message: modifications in order to add a translate into box option in crystal box Index: CrystalBox.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/CrystalBox.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- CrystalBox.java 2 Jun 2003 13:35:02 -0000 1.7 +++ CrystalBox.java 3 Jun 2003 20:38:27 -0000 1.8 @@ -33,14 +33,18 @@ */ public class CrystalBox { + + public final static int ORIGINAL=0; + public final static int INBOX=1; + public final static int CRYSTAL=2; + + private int translationType=0; + private double[][] atomBox; private double[][] bondBox; private double[][] unitBox; - // if true, consider only the atoms as there are given - // in unitCellBox. Do not effectue any translation. - private boolean origAtomsOnly = false; - + /** * Two different parallepipedic clipping boxes can be combined. * The *atom box* determines how many atoms are included in the frame. @@ -101,6 +105,26 @@ } + + /** + * Return the type of translation that will be done on the + * original atoms + * + * There are 3 possibilities + * + * AtomBox.CRYSTAL : a "complete" crystal base on the atomBox range + * AtomBox.ORIGINAL: original atoms without any translation + * AtomBox.INBOX: original atoms with a translation to fit in the unit cell + * + **/ + public int getTranslationType() { + return translationType; + } + + public void setTranslationType(int translationType) { + this.translationType = translationType; + } + /** * Describe <code>setAtomBox</code> method here. * @@ -129,11 +153,6 @@ } - public void setOrigAtomsOnly(boolean origAtomsOnly) { - this.origAtomsOnly = origAtomsOnly; - } - - /** * Describe <code>getAtomBox</code> method here. * @@ -161,8 +180,5 @@ return unitBox; } - public boolean getOrigAtomsOnly() { - return origAtomsOnly; - } } |