[Cdk-commits] CVS: cdkweb/src/java/org/openscience/cdkweb/util displayStructure.java,1.1,1.2 displayStructureAsPDFTable.java,1.1,1.2

[Stefan K. <sh...@us...>]

Update of /cvsroot/cdk/cdkweb/src/java/org/openscience/cdkweb/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28950/src/java/org/openscience/cdkweb/util

Modified Files:
	displayStructure.java displayStructureAsPDFTable.java 
Log Message:
for pdf export


Index: displayStructure.java
===================================================================
RCS file: /cvsroot/cdk/cdkweb/src/java/org/openscience/cdkweb/util/displayStructure.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- displayStructure.java	20 Feb 2006 12:17:16 -0000	1.1
+++ displayStructure.java	21 Feb 2006 13:33:06 -0000	1.2
@@ -38,7 +38,7 @@
     protected String oformat = "PNG";
     protected String odir = "./";
     protected String suffix = ".png";
-    protected JFrame frame = null;
+//    protected JFrame frame = null;
 
 
     IAtomContainer mol;
@@ -71,7 +71,7 @@
         }
 
 
-        this.frame = new JFrame();
+//        this.frame = new JFrame();
     }
 
     public void drawStructure(IAtomContainer mol, int cnt)
@@ -109,8 +109,8 @@
         catch(Exception exc) {
             exc.printStackTrace();		
         }
-        this.frame.getContentPane().add(this);
-        this.frame.pack();
+        //this.frame.getContentPane().add(this);
+        //this.frame.pack();
 
         String filename = "";
         if (cnt <10) filename = this.odir + "/img00"+cnt+this.suffix;
@@ -167,7 +167,7 @@
 
     public void paint(Graphics g)
     {
-        super.paint(g);
+        //super.print(g);
         renderer.paintMolecule(this.mol, (Graphics2D)g, false);
     }
 

Index: displayStructureAsPDFTable.java
===================================================================
RCS file: /cvsroot/cdk/cdkweb/src/java/org/openscience/cdkweb/util/displayStructureAsPDFTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- displayStructureAsPDFTable.java	20 Feb 2006 12:17:16 -0000	1.1
+++ displayStructureAsPDFTable.java	21 Feb 2006 13:33:06 -0000	1.2
@@ -3,7 +3,10 @@
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.geom.Rectangle2D;
 import java.awt.Image;
+import java.awt.image.BufferedImage;
+import java.awt.Color;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -52,7 +55,7 @@
         oformat = "PDF";
 
         decimalFormat = new DecimalFormat("0.000E00");
-        this.frame = new JFrame();
+        //this.frame = new JFrame();
 
         try {
             File file = new File(odir + "/output" + this.suffix);
@@ -146,8 +149,9 @@
         catch(Exception exc) {
             exc.printStackTrace();
         }
-        this.frame.getContentPane().add(this);
-        this.frame.pack();
+this.setSize(new Dimension(width,height));
+        //this.frame.getContentPane().add(this);
+        //this.frame.pack();
 
         Rectangle pageSize = new Rectangle(this.getSize().width, this.getSize().height);
         try {
@@ -168,8 +172,10 @@
             }
             cell.addElement(phrase);
             table.addCell(cell);
-
-            Image awtImage = createImage(this.getSize().width, this.getSize().height);
+this.show();
+                        Image awtImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+//Image awtImage = createImage(width, height);
+System.err.println(awtImage+" awtImagfe");
             Graphics snapGraphics = awtImage.getGraphics();
             paint(snapGraphics);
 
@@ -186,7 +192,9 @@
 
     public void paint(Graphics g)
     {
-        super.paint(g);
+        //super.paint(g);
+g.setColor(Color.WHITE);
+        ((Graphics2D)g).fill(new Rectangle2D.Double(0, 0, width, height));
         renderer.paintMolecule(this.mol, (Graphics2D)g, false);
     }