From: tohel <to...@us...> - 2005-10-11 13:27:01
|
Update of /cvsroot/cdk/cdk/src/org/openscience/cdk/renderer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21477/src/org/openscience/cdk/renderer Modified Files: SimpleRenderer2D.java AbstractRenderer2D.java Log Message: fixed picture export Index: SimpleRenderer2D.java =================================================================== RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/renderer/SimpleRenderer2D.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- SimpleRenderer2D.java 16 Sep 2005 13:46:10 -0000 1.4 +++ SimpleRenderer2D.java 11 Oct 2005 13:26:55 -0000 1.5 @@ -94,7 +94,7 @@ *@param graphics Description of the Parameter */ public void paintMolecule(org.openscience.cdk.interfaces.AtomContainer atomCon, Graphics2D graphics) { - logger.debug("inside paintMolecule()"); + logger.debug("inside paintMolecule()"); customizeRendering(graphics); RingSet ringSet = new RingSet(); org.openscience.cdk.interfaces.Molecule[] molecules = null; @@ -112,7 +112,7 @@ SSSRFinder sssrf = new SSSRFinder(molecules[i]); ringSet.add(sssrf.findSSSR()); } - paintBonds(atomCon, ringSet, graphics); + paintBonds(atomCon, ringSet, graphics); paintAtoms(atomCon, graphics); if (r2dm.getSelectRect() != null) { Index: AbstractRenderer2D.java =================================================================== RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/renderer/AbstractRenderer2D.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- AbstractRenderer2D.java 16 Sep 2005 13:46:10 -0000 1.5 +++ AbstractRenderer2D.java 11 Oct 2005 13:26:56 -0000 1.6 @@ -99,6 +99,8 @@ protected Renderer2DModel r2dm; int graphicsHeight; + + public boolean useScreenSize=true; /** @@ -1074,7 +1076,7 @@ { if (GeometryTools.has2DCoordinates(bond)) { - paintOneBond(GeometryTools.getBondCoordinates(bond), bondColor, graphics); + paintOneBond(GeometryTools.getBondCoordinates(bond), bondColor, graphics); } } @@ -1174,11 +1176,11 @@ public void paintOneBond(int[] coords, Color bondColor, Graphics2D graphics) { graphics.setColor(bondColor); - int[] newCoords = GeometryTools.distanceCalculator(coords, r2dm.getBondWidth() / 2); + int[] newCoords = GeometryTools.distanceCalculator(coords, r2dm.getBondWidth() / 2); int[] screenCoords = getScreenCoordinates(newCoords); int[] xCoords = {screenCoords[0], screenCoords[2], screenCoords[4], screenCoords[6]}; int[] yCoords = {screenCoords[1], screenCoords[3], screenCoords[5], screenCoords[7]}; - graphics.fillPolygon(xCoords, yCoords, 4); + graphics.fillPolygon(xCoords, yCoords, 4); } @@ -1331,6 +1333,12 @@ double zoomFactor = r2dm.getZoomFactor(); screenCoordinate.x = (int) ((double) p.x * zoomFactor); screenCoordinate.y = graphicsHeight - (int) ((double) p.y * zoomFactor); + if(useScreenSize){ + screenCoordinate.y=graphicsHeight - screenCoordinate.y; + }else{ + screenCoordinate.y+=10; + screenCoordinate.x+=10; + } return screenCoordinate; } @@ -1344,7 +1352,7 @@ */ protected int[] getScreenCoordinates(int[] coords) { - graphicsHeight = (int) r2dm.getBackgroundDimension().getHeight(); + graphicsHeight = (int) r2dm.getBackgroundDimension().getHeight(); logger.debug("HEIGHT: " + graphicsHeight); int[] screenCoordinates = new int[coords.length]; double zoomFactor = r2dm.getZoomFactor(); @@ -1352,7 +1360,13 @@ for (int i = 0; i < coordCount; i++) { screenCoordinates[i * 2] = (int) ((double) coords[i * 2] * zoomFactor); - screenCoordinates[i * 2 + 1] = graphicsHeight - (int) ((double) coords[i * 2 + 1] * zoomFactor); + screenCoordinates[i * 2 + 1] = (int) ((double) coords[i * 2 + 1] * zoomFactor); + if(useScreenSize){ + screenCoordinates[i * 2 + 1]=graphicsHeight - screenCoordinates[i * 2 + 1]; + }else{ + screenCoordinates[i * 2 + 1]+=10; + screenCoordinates[i * 2]+=10; + } } return screenCoordinates; } |