From: <sh...@us...> - 2009-06-11 14:50:01
|
Revision: 14611 http://cdk.svn.sourceforge.net/cdk/?rev=14611&view=rev Author: shk3 Date: 2009-06-11 14:49:59 +0000 (Thu, 11 Jun 2009) Log Message: ----------- using the new reaction generation Modified Paths: -------------- jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java 2009-06-11 14:48:48 UTC (rev 14610) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java 2009-06-11 14:49:59 UTC (rev 14611) @@ -63,17 +63,26 @@ import org.openscience.cdk.interfaces.IMoleculeSet; import org.openscience.cdk.nonotify.NoNotificationChemObjectBuilder; import org.openscience.cdk.renderer.Renderer; +import org.openscience.cdk.renderer.elements.ElementGroup; import org.openscience.cdk.renderer.font.AWTFontManager; import org.openscience.cdk.renderer.generators.AtomContainerBoundsGenerator; import org.openscience.cdk.renderer.generators.BasicAtomGenerator; +import org.openscience.cdk.renderer.generators.BoundsGenerator; import org.openscience.cdk.renderer.generators.ExtendedAtomGenerator; import org.openscience.cdk.renderer.generators.ExternalHighlightGenerator; import org.openscience.cdk.renderer.generators.HighlightAtomGenerator; import org.openscience.cdk.renderer.generators.HighlightBondGenerator; import org.openscience.cdk.renderer.generators.IGenerator; +import org.openscience.cdk.renderer.generators.IReactionGenerator; import org.openscience.cdk.renderer.generators.LonePairGenerator; +import org.openscience.cdk.renderer.generators.MappingGenerator; import org.openscience.cdk.renderer.generators.MergeAtomsGenerator; +import org.openscience.cdk.renderer.generators.ProductsBoxGenerator; import org.openscience.cdk.renderer.generators.RadicalGenerator; +import org.openscience.cdk.renderer.generators.ReactantsBoxGenerator; +import org.openscience.cdk.renderer.generators.ReactionArrowGenerator; +import org.openscience.cdk.renderer.generators.ReactionBoxGenerator; +import org.openscience.cdk.renderer.generators.ReactionPlusGenerator; import org.openscience.cdk.renderer.generators.RingGenerator; import org.openscience.cdk.renderer.generators.SelectAtomGenerator; import org.openscience.cdk.renderer.generators.SelectBondGenerator; @@ -140,7 +149,9 @@ // setup the Renderer and the controller 'model' if (this.renderer == null) { - this.renderer = new Renderer(makeGenerators(), new AWTFontManager()); + this.renderer = new Renderer(makeGenerators(), makeReactionGenerators(), new AWTFontManager()); + //any specific rendering settings defaults should go here + this.renderer.getRenderer2DModel().setShowEndCarbons(true); } this.setFitToScreen(fitToScreen); this.controllerModel = new ControllerModel(); @@ -164,6 +175,27 @@ this.isNewChemModel = true; } + private List<IReactionGenerator> makeReactionGenerators() { + List<IReactionGenerator> generators = new ArrayList<IReactionGenerator>(); + // generate the bounds first, so that they are to the back + BoundsGenerator boundsGenerator = new BoundsGenerator(); + if(debug) + generators.add(boundsGenerator); + ReactionBoxGenerator boxGenerator = new ReactionBoxGenerator(); + generators.add(boxGenerator); + ReactionArrowGenerator arrowGenerator = new ReactionArrowGenerator(); + generators.add(arrowGenerator); + ReactionPlusGenerator plusGenerator = new ReactionPlusGenerator(); + generators.add(plusGenerator); + ReactantsBoxGenerator reactantsBoxGenerator = new ReactantsBoxGenerator(); + generators.add(reactantsBoxGenerator); + ProductsBoxGenerator productsBoxGenerator = new ProductsBoxGenerator(); + generators.add(productsBoxGenerator); + MappingGenerator mapper = new MappingGenerator(); + generators.add(mapper); + return generators; + } + private List<IGenerator> makeGenerators() { List<IGenerator> generators = new ArrayList<IGenerator>(); if(debug) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |