From: Egon W. <eg...@us...> - 2004-05-27 17:54:46
|
Update of /cvsroot/cdk/cdk/src/org/openscience/cdk/renderer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17642/src/org/openscience/cdk/renderer Modified Files: Renderer2D.java Renderer2DModel.java Log Message: Added AtomColorer.getAtomColor(Atom, Color) (closes RFE #949751) Index: Renderer2D.java =================================================================== RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/renderer/Renderer2D.java,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- Renderer2D.java 26 May 2004 13:01:19 -0000 1.99 +++ Renderer2D.java 27 May 2004 17:54:25 -0000 1.100 @@ -76,6 +76,10 @@ * left-bottom corner, with the x axis to the right, and the y axis towards * the top of the screen. The system is thus right handed. * + * <p>This modules tries to adhere to guidelines being developed by the IUPAC + * which results can be found at + * <a href="http://www.angelfire.com/sc3/iupacstructures/">http://www.angelfire.com/sc3/iupacstructures/</a>. + * * @cdk.module render * * @author steinbeck @@ -83,6 +87,8 @@ * * @cdk.created 2002-10-03 * @cdk.keyword viewer, 2D-viewer + * + * @see org.openscience.cdk.renderer.Renderer2DModel */ public class Renderer2D implements MouseMotionListener { @@ -616,7 +622,7 @@ // STEP 4: draw all parts in the label - Color atomColor = r2dm.getAtomColor(atom); + Color atomColor = r2dm.getAtomColor(atom, r2dm.getForeColor()); // draw SYMBOL { Index: Renderer2DModel.java =================================================================== RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/renderer/Renderer2DModel.java,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- Renderer2DModel.java 9 Apr 2004 19:05:12 -0000 1.36 +++ Renderer2DModel.java 27 May 2004 17:54:26 -0000 1.37 @@ -546,9 +546,9 @@ * If not, the color from the CDK2DAtomColor is used * (if selected). Otherwise, the atom is colored black. */ - public Color getAtomColor(Atom atom) { + public Color getAtomColor(Atom atom, Color defaultColor) { // logger.debug("Getting atom front color for " + atom.toString()); - Color atomColor = getForeColor(); + Color atomColor = defaultColor; if (colorAtomsByType) { // logger.debug("Coloring atom by type"); atomColor = colorer.getAtomColor(atom); |