From: Egon W. <eg...@us...> - 2002-02-06 12:47:18
|
Update of /cvsroot/cdk/cdk/org/openscience/cdk/renderer In directory usw-pr-cvs1:/tmp/cvs-serv7429/org/openscience/cdk/renderer Modified Files: Renderer3D.java Renderer3DModel.java Log Message: Atoms in non-accelerated 3D viewer now get painted at filled circles. Still hardly functional. Index: Renderer3D.java =================================================================== RCS file: /cvsroot/cdk/cdk/org/openscience/cdk/renderer/Renderer3D.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Renderer3D.java 2002/01/25 14:06:12 1.3 --- Renderer3D.java 2002/02/06 12:47:15 1.4 *************** *** 28,31 **** --- 28,32 ---- package org.openscience.cdk.renderer; + import org.openscience.cdk.renderer.color.*; import org.openscience.cdk.geometry.*; import org.openscience.cdk.tools.*; *************** *** 42,47 **** public Renderer3D() { ! logger = new org.openscience.cdk.tools.LoggingTool(this.getClass().getName()); ! r3dm = new Renderer3DModel(); } --- 43,47 ---- public Renderer3D() { ! this(new Renderer3DModel()); } *************** *** 62,68 **** logger.debug("Paint atom " + i); Atom atom = atoms[i]; ! int atomRadius = 10; ! g.fillRect((int)atom.getX2D() - (atomRadius / 2), (int)atom.getY2D() - (atomRadius / 2), atomRadius, atomRadius); ! // g.drawOval(x - radius, y - radius, diameter, diameter); } } --- 62,74 ---- logger.debug("Paint atom " + i); Atom atom = atoms[i]; ! int atomRadius = 20; ! g.setColor(r3dm.getAtomColor(atom)); ! g.fillOval((int)atom.getX2D() - (atomRadius / 2), ! (int)atom.getY2D() - (atomRadius / 2), ! atomRadius, atomRadius); ! g.setColor(Color.black); ! g.drawOval((int)atom.getX2D() - (atomRadius / 2), ! (int)atom.getY2D() - (atomRadius / 2), ! atomRadius, atomRadius); } } Index: Renderer3DModel.java =================================================================== RCS file: /cvsroot/cdk/cdk/org/openscience/cdk/renderer/Renderer3DModel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Renderer3DModel.java 2002/01/23 13:46:25 1.1 --- Renderer3DModel.java 2002/02/06 12:47:15 1.2 *************** *** 28,35 **** package org.openscience.cdk.renderer; ! import java.awt.*; ! import org.openscience.cdk.*; import org.openscience.cdk.event.*; import java.util.*; --- 28,36 ---- package org.openscience.cdk.renderer; ! import org.openscience.cdk.renderer.color.*; import org.openscience.cdk.event.*; + import org.openscience.cdk.*; import java.util.*; + import java.awt.*; *************** *** 40,43 **** --- 41,45 ---- private Color backColor = Color.white; + private AtomColorer atomColorer = new CDKAtomColors(); private Vector listeners = new Vector(); *************** *** 92,95 **** --- 94,106 ---- public void setBackColor(Color backColor) { this.backColor = backColor; + } + + /** + * Returns the atom colorer + * + * @return the atom colorer + */ + public Color getAtomColor(Atom a) { + return atomColorer.getAtomColor(a); } } |