diff --git a/src/main/org/openscience/cdk/renderer/generators/ProductsBoxGenerator.java b/src/main/org/openscience/cdk/renderer/generators/ProductsBoxGenerator.java index 60071a36d24..d05972e9519 100644 --- a/src/main/org/openscience/cdk/renderer/generators/ProductsBoxGenerator.java +++ b/src/main/org/openscience/cdk/renderer/generators/ProductsBoxGenerator.java @@ -20,6 +20,7 @@ */ package org.openscience.cdk.renderer.generators; +import java.awt.Color; import java.awt.geom.Rectangle2D; import org.openscience.cdk.interfaces.IAtomContainer; @@ -60,12 +61,21 @@ public IRenderingElement generate(IReaction reaction, RendererModel model) { if (totalBounds == null) return null; ElementGroup diagram = new ElementGroup(); - diagram.add(new RectangleElement(totalBounds.getMinX()-DISTANCE, - totalBounds.getMinY()-DISTANCE, - totalBounds.getMaxX()+DISTANCE, - totalBounds.getMaxY()+DISTANCE, - model.getForeColor())); - diagram.add(new TextElement((totalBounds.getMinX()+totalBounds.getMaxX())/2, totalBounds.getMinY()-DISTANCE, "Products", model.getForeColor())); + Color foregroundColor = model.getRenderingParameter( + BasicSceneGenerator.ForegroundColor.class).getValue(); + diagram.add(new RectangleElement( + totalBounds.getMinX()-DISTANCE, + totalBounds.getMinY()-DISTANCE, + totalBounds.getMaxX()+DISTANCE, + totalBounds.getMaxY()+DISTANCE, + foregroundColor + )); + diagram.add(new TextElement( + (totalBounds.getMinX()+totalBounds.getMaxX())/2, + totalBounds.getMinY()-DISTANCE, + "Products", + foregroundColor + )); return diagram; } diff --git a/src/main/org/openscience/cdk/renderer/generators/ReactantsBoxGenerator.java b/src/main/org/openscience/cdk/renderer/generators/ReactantsBoxGenerator.java index 29fe226c189..e7033809a53 100644 --- a/src/main/org/openscience/cdk/renderer/generators/ReactantsBoxGenerator.java +++ b/src/main/org/openscience/cdk/renderer/generators/ReactantsBoxGenerator.java @@ -52,11 +52,14 @@ public IRenderingElement generate(IReaction reaction, RendererModel model) { double minY = totalBounds.getMinY(); double maxX = totalBounds.getMaxX(); double maxY = totalBounds.getMaxY(); - Color c = model.getForeColor(); + Color foregroundColor = model.getRenderingParameter( + BasicSceneGenerator.ForegroundColor.class).getValue(); diagram.add(new RectangleElement( - minX - d, minY - d, maxX + d, maxY + d, c)); + minX - d, minY - d, maxX + d, maxY + d, foregroundColor + )); diagram.add(new TextElement( - (minX+maxX)/2, minY-d, "Reactants", c)); + (minX+maxX)/2, minY-d, "Reactants", foregroundColor + )); return diagram; } diff --git a/src/main/org/openscience/cdk/renderer/generators/ReactionArrowGenerator.java b/src/main/org/openscience/cdk/renderer/generators/ReactionArrowGenerator.java index eca0862b755..de11bca6ff1 100644 --- a/src/main/org/openscience/cdk/renderer/generators/ReactionArrowGenerator.java +++ b/src/main/org/openscience/cdk/renderer/generators/ReactionArrowGenerator.java @@ -18,6 +18,7 @@ */ package org.openscience.cdk.renderer.generators; +import java.awt.Color; import java.awt.geom.Rectangle2D; import org.openscience.cdk.interfaces.IReaction; @@ -45,10 +46,15 @@ public IRenderingElement generate(IReaction reaction, RendererModel model) { return null; double d = model.getBondLength() / model.getScale(); - return new ArrowElement(totalBoundsReactants.getMaxX() + d, - totalBoundsReactants.getCenterY(), - totalBoundsProducts.getMinX() - d, - totalBoundsReactants.getCenterY(), - 1 / model.getScale(),true,model.getForeColor()); + Color foregroundColor = model.getRenderingParameter( + BasicSceneGenerator.ForegroundColor.class).getValue(); + return new ArrowElement( + totalBoundsReactants.getMaxX() + d, + totalBoundsReactants.getCenterY(), + totalBoundsProducts.getMinX() - d, + totalBoundsReactants.getCenterY(), + 1 / model.getScale(), true, + foregroundColor + ); } } diff --git a/src/main/org/openscience/cdk/renderer/generators/ReactionBoxGenerator.java b/src/main/org/openscience/cdk/renderer/generators/ReactionBoxGenerator.java index db3328adee8..c872fef9901 100644 --- a/src/main/org/openscience/cdk/renderer/generators/ReactionBoxGenerator.java +++ b/src/main/org/openscience/cdk/renderer/generators/ReactionBoxGenerator.java @@ -18,6 +18,7 @@ */ package org.openscience.cdk.renderer.generators; +import java.awt.Color; import java.awt.geom.Rectangle2D; import org.openscience.cdk.interfaces.IReaction; @@ -45,17 +46,22 @@ public IRenderingElement generate(IReaction reaction, RendererModel model) { if (totalBounds == null) return null; ElementGroup diagram = new ElementGroup(); - diagram.add(new RectangleElement(totalBounds.getMinX()-d, - totalBounds.getMinY()-d, - totalBounds.getMaxX()+d, - totalBounds.getMaxY()+d, - model.getForeColor())); + Color foregroundColor = model.getRenderingParameter( + BasicSceneGenerator.ForegroundColor.class).getValue(); + diagram.add(new RectangleElement( + totalBounds.getMinX()-d, + totalBounds.getMinY()-d, + totalBounds.getMaxX()+d, + totalBounds.getMaxY()+d, + foregroundColor + )); if (reaction.getID() != null) { - diagram.add(new TextElement((totalBounds.getMinX() - +totalBounds.getMaxX())/2, - totalBounds.getMinY()-d, - reaction.getID(), - model.getForeColor())); + diagram.add(new TextElement( + (totalBounds.getMinX()+totalBounds.getMaxX())/2, + totalBounds.getMinY()-d, + reaction.getID(), + foregroundColor + )); } return diagram; } diff --git a/src/main/org/openscience/cdk/renderer/generators/ReactionPlusGenerator.java b/src/main/org/openscience/cdk/renderer/generators/ReactionPlusGenerator.java index 63cf6c453d0..cd2ad75683b 100644 --- a/src/main/org/openscience/cdk/renderer/generators/ReactionPlusGenerator.java +++ b/src/main/org/openscience/cdk/renderer/generators/ReactionPlusGenerator.java @@ -47,7 +47,8 @@ public IRenderingElement generate(IReaction reaction, RendererModel model) { Rectangle2D bounds1 = Renderer.calculateBounds(reactants.getAtomContainer(0)); double axis = totalBoundsReactants.getCenterY(); - Color color = model.getForeColor(); + Color color = model.getRenderingParameter( + BasicSceneGenerator.ForegroundColor.class).getValue(); for (int i = 1; i < reaction.getReactantCount(); i++) { Rectangle2D bounds2 = Renderer.calculateBounds(reactants.getAtomContainer(i));