Author: kono Date: 2011-06-23 16:25:50 -0700 (Thu, 23 Jun 2011) New Revision: 25908
Modified: core3/io-impl/trunk/pom.xml core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/write/graphics/PDFWriter.java core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/write/graphics/PDFWriterFactory.java core3/io-impl/trunk/src/test/java/org/cytoscape/io/internal/write/graphics/PDFWriterTest.java Log: iText version had been changed to oler version since latest version has broken OSGi metadata. Modified: core3/io-impl/trunk/pom.xml =================================================================== --- core3/io-impl/trunk/pom.xml 2011-06-23 23:02:42 UTC (rev 25907) +++ core3/io-impl/trunk/pom.xml 2011-06-23 23:25:50 UTC (rev 25908) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <groupId>org.cytoscape</groupId> @@ -88,28 +89,28 @@ </configuration> </plugin> <plugin> - <groupId>org.jvnet.jaxb2.maven2</groupId> - <artifactId>maven-jaxb2-plugin</artifactId> - <version>0.7.4</version> - <executions> - <execution> - <id>vizmap</id> - <goals> - <goal>generate</goal> - </goals> - <configuration> - <schemaDirectory>src/main/resources/xsd</schemaDirectory> - <schemaIncludes> - <include>vizmap.xsd</include> - </schemaIncludes> - <generatePackage>org.cytoscape.io.internal.util.vizmap.model</generatePackage> - <verbose>true</verbose> - <removeOldOutput>false</removeOldOutput> - <forceRegenerate>true</forceRegenerate> - </configuration> - </execution> - </executions> - </plugin> + <groupId>org.jvnet.jaxb2.maven2</groupId> + <artifactId>maven-jaxb2-plugin</artifactId> + <version>0.7.4</version> + <executions> + <execution> + <id>vizmap</id> + <goals> + <goal>generate</goal> + </goals> + <configuration> + <schemaDirectory>src/main/resources/xsd</schemaDirectory> + <schemaIncludes> + <include>vizmap.xsd</include> + </schemaIncludes> + <generatePackage>org.cytoscape.io.internal.util.vizmap.model</generatePackage> + <verbose>true</verbose> + <removeOldOutput>false</removeOldOutput> + <forceRegenerate>true</forceRegenerate> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> @@ -159,14 +160,21 @@ <artifactId>equations-api</artifactId> <version>3.0.0-alpha2</version> </dependency> - + <!-- 3rd party libraries --> - <dependency> + <!-- <dependency> <groupId>com.itextpdf</groupId> <artifactId>itextpdf</artifactId> <version>5.1.1</version> <scope>compile</scope> + </dependency> --> + + <dependency> + <groupId>com.lowagie.text</groupId> + <artifactId>com.springsource.com.lowagie.text</artifactId> + <version>2.0.8</version> </dependency> + <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> @@ -177,7 +185,7 @@ <artifactId>opencsv</artifactId> <version>2.1</version> </dependency> - + <!-- freehep --> <dependency> <groupId>cytoscape-temp</groupId> Modified: core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/write/graphics/PDFWriter.java =================================================================== --- core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/write/graphics/PDFWriter.java 2011-06-23 23:02:42 UTC (rev 25907) +++ core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/write/graphics/PDFWriter.java 2011-06-23 23:25:50 UTC (rev 25908) @@ -1,10 +1,8 @@ package org.cytoscape.io.internal.write.graphics; import java.awt.Graphics2D; -import java.awt.Image; import java.io.BufferedOutputStream; import java.io.FileOutputStream; -import java.io.IOException; import java.io.OutputStream; import org.cytoscape.io.write.CyWriter; @@ -15,15 +13,22 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.itextpdf.text.Document; -import com.itextpdf.text.DocumentException; -import com.itextpdf.text.PageSize; -import com.itextpdf.text.Rectangle; -import com.itextpdf.text.pdf.DefaultFontMapper; -import com.itextpdf.text.pdf.PdfContentByte; -import com.itextpdf.text.pdf.PdfGraphics2D; -import com.itextpdf.text.pdf.PdfWriter; +import com.lowagie.text.Document; +import com.lowagie.text.PageSize; +import com.lowagie.text.Rectangle; +import com.lowagie.text.pdf.DefaultFontMapper; +import com.lowagie.text.pdf.PdfContentByte; +import com.lowagie.text.pdf.PdfWriter; +//import com.itextpdf.text.Document; +//import com.itextpdf.text.DocumentException; +//import com.itextpdf.text.PageSize; +//import com.itextpdf.text.Rectangle; +//import com.itextpdf.text.pdf.DefaultFontMapper; +//import com.itextpdf.text.pdf.PdfContentByte; +//import com.itextpdf.text.pdf.PdfGraphics2D; +//import com.itextpdf.text.pdf.PdfWriter; + /** * PDF exporter by the iText library. */ @@ -35,6 +40,7 @@ private final Double width; private final Double height; private final RenderingEngine<?> engine; + private final OutputStream stream; public PDFWriter(final RenderingEngine<?> engine, final OutputStream stream) { @@ -61,23 +67,18 @@ taskMonitor.setProgress(0.0); taskMonitor.setStatusMessage("Creating PDF image..."); - Thread.sleep(2000); logger.debug("PDF Rendering start"); - - final OutputStream os = new BufferedOutputStream(new FileOutputStream("itextTest100000.pdf")); - final Rectangle pageSize = PageSize.LETTER; final Document document = new Document(pageSize); logger.debug("Document created: " + document); - final PdfWriter writer = PdfWriter.getInstance(document, os); + final PdfWriter writer = PdfWriter.getInstance(document, stream); document.open(); final PdfContentByte canvas = writer.getDirectContent(); logger.debug("CB0 created: " + canvas.getClass()); - final float pageWidth = pageSize.getWidth(); final float pageHeight = pageSize.getHeight(); @@ -85,33 +86,28 @@ final DefaultFontMapper fontMapper = new DefaultFontMapper(); logger.debug("FontMapper created = " + fontMapper); Graphics2D g = null; - logger.debug("!!!!! Enter block 2"); + logger.debug("!!!!! Enter block 2"); + + if (exportTextAsFont) { + g = canvas.createGraphics(pageWidth, pageHeight, new DefaultFontMapper()); + } else { g = canvas.createGraphicsShapes(pageWidth, pageHeight); - logger.debug("!!!!! G2D created: " + g); - - g.dispose(); -// if (exportTextAsFont) -// g = cb.createGraphics(pageWidth, pageHeight, new DefaultFontMapper()); -// else -// g = cb.createGraphicsShapes(pageWidth, pageHeight); + } + logger.debug("##### G2D created: " + g); - -// double imageScale = Math.min(pageSize.getWidth() / width, pageSize.getHeight() / height); -// g.scale(imageScale, imageScale); + double imageScale = Math.min(pageSize.getWidth() / width, pageSize.getHeight() / height); + g.scale(imageScale, imageScale); -// final Image image = engine.createImage(width.intValue(), height.intValue()); -// -// logger.debug("AWT Image created for PDF: " + image); -// com.itextpdf.text.Image itxImage = com.itextpdf.text.Image.getInstance(image, null); -// logger.debug("iText Image created for PDF: " + itxImage); -// canvas.addImage(itxImage, itxImage.getWidth(), 0, 0, itxImage.getHeight(), 0, 0); -// g.drawImage(image, 0, 0, null); + logger.debug("##### Start Rendering Phase 2: " + engine.toString()); + engine.printCanvas(g); + logger.debug("##### Canvas Rendering Done: "); + + g.dispose(); + document.close(); + writer.close(); - - os.close(); stream.close(); - document.close(); logger.debug("PDF rendering finished."); } Modified: core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/write/graphics/PDFWriterFactory.java =================================================================== --- core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/write/graphics/PDFWriterFactory.java 2011-06-23 23:02:42 UTC (rev 25907) +++ core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/write/graphics/PDFWriterFactory.java 2011-06-23 23:25:50 UTC (rev 25908) @@ -2,9 +2,14 @@ import org.cytoscape.io.CyFileFilter; import org.cytoscape.io.write.CyWriter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class PDFWriterFactory extends AbstractPresentationWriterFactory { + private static final Logger logger = LoggerFactory.getLogger(PDFWriterFactory.class); + + public PDFWriterFactory(CyFileFilter fileFilter) { super(fileFilter); } Modified: core3/io-impl/trunk/src/test/java/org/cytoscape/io/internal/write/graphics/PDFWriterTest.java =================================================================== --- core3/io-impl/trunk/src/test/java/org/cytoscape/io/internal/write/graphics/PDFWriterTest.java 2011-06-23 23:02:42 UTC (rev 25907) +++ core3/io-impl/trunk/src/test/java/org/cytoscape/io/internal/write/graphics/PDFWriterTest.java 2011-06-23 23:25:50 UTC (rev 25908) @@ -1,6 +1,6 @@ package org.cytoscape.io.internal.write.graphics; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; import java.awt.Graphics2D; import java.io.BufferedOutputStream; @@ -11,14 +11,21 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.itextpdf.text.Document; -import com.itextpdf.text.PageSize; -import com.itextpdf.text.Rectangle; -import com.itextpdf.text.pdf.DefaultFontMapper; -import com.itextpdf.text.pdf.PdfContentByte; -import com.itextpdf.text.pdf.PdfWriter; +import com.lowagie.text.Document; +import com.lowagie.text.PageSize; +import com.lowagie.text.Rectangle; +import com.lowagie.text.pdf.DefaultFontMapper; +import com.lowagie.text.pdf.PdfContentByte; +import com.lowagie.text.pdf.PdfWriter; +//import com.itextpdf.text.Document; +//import com.itextpdf.text.PageSize; +//import com.itextpdf.text.Rectangle; +//import com.itextpdf.text.pdf.DefaultFontMapper; +//import com.itextpdf.text.pdf.PdfContentByte; +//import com.itextpdf.text.pdf.PdfWriter; + public class PDFWriterTest { private static final Logger logger = LoggerFactory.getLogger(PDFWriterTest.class); @@ -45,11 +52,13 @@ logger.debug("Page W: " + pageWidth + " Page H: " + pageHeight); final DefaultFontMapper fontMapper = new DefaultFontMapper(); logger.debug("FontMapper created = " + fontMapper); - final Graphics2D g = canvas.createGraphics(100f, 100f); + final Graphics2D g = canvas.createGraphics(pageWidth, pageHeight); logger.debug("! G2D created = " + g); + assertNotNull(g); g.dispose(); + document.close(); os.close(); } -- You received this message because you are subscribed to the Google Groups "cytoscape-cvs" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/cytoscape-cvs?hl=en.
