From: Egon W. <eg...@us...> - 2005-04-04 17:38:39
|
Update of /cvsroot/cdk/cdk-taverna/src/org/openscience/cdk/applications/taverna/renderers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9905/src/org/openscience/cdk/applications/taverna/renderers Modified Files: CDK2DRenderer.java Log Message: Take rendering background from actual window size Index: CDK2DRenderer.java =================================================================== RCS file: /cvsroot/cdk/cdk-taverna/src/org/openscience/cdk/applications/taverna/renderers/CDK2DRenderer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- CDK2DRenderer.java 4 Apr 2005 16:06:37 -0000 1.1 +++ CDK2DRenderer.java 4 Apr 2005 17:38:19 -0000 1.2 @@ -11,9 +11,10 @@ import java.util.regex.Pattern; import org.embl.ebi.escience.baclava.*; import org.embl.ebi.escience.scuflui.renderers.*; +import org.openscience.cdk.AtomContainer; import org.openscience.cdk.Molecule; -import org.openscience.cdk.applications.swing.*; import org.openscience.cdk.renderer.*; +import org.openscience.cdk.geometry.*; /** * Renders using the CDK software for chemical structures. @@ -54,3 +55,30 @@ } +class MoleculeViewer2D extends JPanel { + + public AtomContainer atomContainer; + public Renderer2DModel r2dm; + public Renderer2D renderer; + + public MoleculeViewer2D(AtomContainer atomContainer, Renderer2DModel r2dm) { + this.atomContainer = atomContainer; + this.r2dm = r2dm; + r2dm.setBackgroundDimension(this.getSize(null)); + renderer = new Renderer2D(r2dm); + } + + public void paint(Graphics graphics) { + super.paint(graphics); + if (atomContainer != null) { + setBackground(r2dm.getBackColor()); + GeometryTools.translateAllPositive(atomContainer); + GeometryTools.scaleMolecule(atomContainer, this.getSize(null), 0.8); + GeometryTools.center(atomContainer, this.getSize(null)); + renderer.paintMolecule(atomContainer, (Graphics2D)graphics); + } + } +} + + + |