From: Michael T H. <mic...@us...> - 2003-08-20 02:15:04
|
Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/datamodel In directory sc8-pr-cvs1:/tmp/cvs-serv29990/src/org/openscience/jmol/viewer/datamodel Modified Files: AtomShape.java BondShape.java JmolFrame.java Log Message: Povray now works with no references to ChemFile/ChemFrame/jmol.Atom Index: AtomShape.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/datamodel/AtomShape.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- AtomShape.java 19 Aug 2003 22:16:51 -0000 1.5 +++ AtomShape.java 20 Aug 2003 01:37:33 -0000 1.6 @@ -290,6 +290,14 @@ return frame.viewer.getCovalentRadius(atomicNumber, clientAtom); } + public short getColix() { + return colixAtom; + } + + public double getRadius() { + return (styleAtom == JmolViewer.NONE) ? 0 : marAtom / 1000.0; + } + public ProteinProp getProteinProp() { return pprop; } Index: BondShape.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/datamodel/BondShape.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- BondShape.java 17 Aug 2003 00:28:37 -0000 1.3 +++ BondShape.java 20 Aug 2003 01:37:33 -0000 1.4 @@ -40,8 +40,8 @@ public final static byte BACKBONE = 4; public final static byte ALL = COVALENT | BACKBONE; - AtomShape atomShape1; - AtomShape atomShape2; + public AtomShape atomShape1; + public AtomShape atomShape2; byte order; byte style; short mar; @@ -105,6 +105,18 @@ public void setColix(short colix) { this.colix = colix; + } + + public double getRadius() { + return mar/1000.0; + } + + public short getColix1() { + return (colix != 0 ? colix : atomShape1.colixAtom); + } + + public short getColix2() { + return (colix != 0 ? colix : atomShape2.colixAtom); } } Index: JmolFrame.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/datamodel/JmolFrame.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- JmolFrame.java 18 Aug 2003 09:57:11 -0000 1.5 +++ JmolFrame.java 20 Aug 2003 01:37:33 -0000 1.6 @@ -44,9 +44,9 @@ final static int growthIncrement = 128; int atomShapeCount = 0; - AtomShape[] atomShapes; + public AtomShape[] atomShapes; int bondShapeCount = 0; - BondShape[] bondShapes; + public BondShape[] bondShapes; public JmolFrame(JmolViewer viewer, int atomCount, boolean hasPdbRecords) { @@ -95,6 +95,14 @@ public AtomShape getAtomAt(int atomIndex) { return atomShapes[atomIndex]; + } + + public int getBondCount() { + return bondShapeCount; + } + + public BondShape getBondAt(int bondIndex) { + return bondShapes[bondIndex]; } public boolean hasPdbRecords() { |