Implemented the generateDiagram and use that in the paint methods, wh…

…ich fixes reaction rendering as the ReactionRenderer.generateDiagram() uses MoleculeSetRenderer.generateDiagram()
cdk · May 19, 2012 · 2ffc5a1 · 2ffc5a1
1 parent d13b1a2
commit 2ffc5a1
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/main/org/openscience/cdk/renderer/MoleculeSetRenderer.java b/src/main/org/openscience/cdk/renderer/MoleculeSetRenderer.java
@@ -37,9 +37,9 @@
 import org.openscience.cdk.renderer.elements.ElementGroup;
 import org.openscience.cdk.renderer.elements.IRenderingElement;
 import org.openscience.cdk.renderer.font.IFontManager;
+import org.openscience.cdk.renderer.generators.IGenerator;
 import org.openscience.cdk.renderer.generators.BasicBondGenerator.BondLength;
 import org.openscience.cdk.renderer.generators.BasicSceneGenerator.Scale;
-import org.openscience.cdk.renderer.generators.IGenerator;
 import org.openscience.cdk.renderer.visitor.IDrawVisitor;
 
 /**
@@ -221,10 +221,7 @@ public Rectangle paint(IMoleculeSet moleculeSet, IDrawVisitor drawVisitor) {
 
         // setup and draw
         this.setupTransformNatural(totalBounds);
-        ElementGroup diagram = new ElementGroup();
-        for (IAtomContainer molecule : moleculeSet.molecules()) {
-            diagram.add(atomContainerRenderer.generateDiagram(molecule));
-        }
+        IRenderingElement diagram = this.generateDiagram(moleculeSet);
         this.paint(drawVisitor, diagram);
 
         return this.convertToDiagramBounds(totalBounds);
@@ -256,12 +253,16 @@ public void paint(IMoleculeSet molecules,
         this.setupTransformToFit(bounds, totalBounds,
         		AverageBondLengthCalculator.calculateAverageBondLength(molecules), resetCenter);
 
+        IRenderingElement diagram = this.generateDiagram(molecules);
+        this.paint(drawVisitor, diagram);
+    }
+
+    public IRenderingElement generateDiagram(IMoleculeSet molecules) {
         ElementGroup diagram = new ElementGroup();
         for (IAtomContainer molecule : molecules.molecules()) {
             diagram.add(atomContainerRenderer.generateDiagram(molecule));
         }
-
-        this.paint(drawVisitor, diagram);
+        return diagram;
     }
 
 	public Rectangle calculateDiagramBounds(IMoleculeSet moleculeSet) {