From: <sh...@us...> - 2009-04-08 11:11:26
|
Revision: 14543 http://cdk.svn.sourceforge.net/cdk/?rev=14543&view=rev Author: shk3 Date: 2009-04-08 11:11:21 +0000 (Wed, 08 Apr 2009) Log Message: ----------- modularized things a bit Modified Paths: -------------- cdk/branches/jchempaint-primary/src/main/org/openscience/cdk/renderer/generators/ReactionBoxGenerator.java Modified: cdk/branches/jchempaint-primary/src/main/org/openscience/cdk/renderer/generators/ReactionBoxGenerator.java =================================================================== --- cdk/branches/jchempaint-primary/src/main/org/openscience/cdk/renderer/generators/ReactionBoxGenerator.java 2009-04-08 11:05:10 UTC (rev 14542) +++ cdk/branches/jchempaint-primary/src/main/org/openscience/cdk/renderer/generators/ReactionBoxGenerator.java 2009-04-08 11:11:21 UTC (rev 14543) @@ -43,6 +43,21 @@ public IRenderingElement generate(IReaction reaction, RendererModel model) { DISTANCE = model.getBondLength() / model.getScale(); + Rectangle2D totalBounds = getBounds(reaction); + 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())); + if(reaction.getID()!=null) + diagram.add(new TextElement((totalBounds.getMinX()+totalBounds.getMaxX())/2, totalBounds.getMinY()-DISTANCE, reaction.getID(), model.getForeColor())); + return diagram; + } + + public static Rectangle2D getBounds(IReaction reaction){ Rectangle2D totalBounds = null; for (IAtomContainer molecule : reaction.getReactants().molecules()) { Rectangle2D bounds = BoundsGenerator.calculateBounds(molecule); @@ -60,17 +75,6 @@ totalBounds = totalBounds.createUnion(bounds); } } - 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())); - if(reaction.getID()!=null) - diagram.add(new TextElement((totalBounds.getMinX()+totalBounds.getMaxX())/2, totalBounds.getMinY()-DISTANCE, reaction.getID(), model.getForeColor())); - return diagram; + return totalBounds; } - } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |