Changeset 1102 for trunk/src/org/expeditee/io/PDF2Writer.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

• trunk/src/org/expeditee/io/PDF2Writer.java (modified) (13 diffs)

trunk/src/org/expeditee/io/PDF2Writer.java

@@ -19 +19 @@
 package org.expeditee.io;
 
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Image;
-import java.awt.Polygon;
-import java.awt.geom.AffineTransform;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -34 +29 @@
 import java.util.Set;
 
+import org.expeditee.core.Colour;
+import org.expeditee.core.Dimension;
+import org.expeditee.core.Image;
+import org.expeditee.core.bounds.PolygonBounds;
+import org.expeditee.gio.swing.SwingConversions;
+import org.expeditee.gio.swing.SwingMiscManager;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameGraphics;
@@ -145 +147 @@
 
         public PDF2Writer() {
-                _pageSize = FrameGraphics.getMaxSize();
+                _pageSize = DisplayController.getFramePaintArea().getSize();
                 _pdfDocument = new Document(new Rectangle(_pageSize.width, _pageSize.height));
         }
@@ -233 +235 @@
                 // set bg color
                 PdfContentByte cb = _pdfWriter.getDirectContent();
-                cb.setColorFill(starting.getPaintBackgroundColor());
+                cb.setColorFill(SwingConversions.toSwingColor(starting.getPaintBackgroundColor()));
                 cb.rectangle(0, 0, _pageSize.width, _pageSize.height);
                 cb.fill();
@@ -239 +241 @@
         }
         
-        private void drawPolygon(PdfContentByte cb, Polygon poly, Color fill, Color line, float lineThickness) {
+        private void drawPolygon(PdfContentByte cb, PolygonBounds poly, Colour fill, Colour line, float lineThickness) {
                 if(poly != null) {
-                        cb.moveTo(poly.xpoints[0], _height - poly.ypoints[0]);
-                        for(int i = 1; i < poly.npoints; i++) {
-                                cb.lineTo(poly.xpoints[i], _height - poly.ypoints[i]);
+                        cb.moveTo(poly.toArray()[0].x, _height - poly.toArray()[0].y);
+                        for(int i = 1; i < poly.toArray().length; i++) {
+                                cb.lineTo(poly.toArray()[i].x, _height - poly.toArray()[i].y);
                         }
                         cb.closePath();
                         if(fill != null) {
-                                cb.setColorFill(fill);
+                                cb.setColorFill(SwingConversions.toSwingColor(fill));
                                 if(lineThickness > 0) {
                                 cb.setLineWidth(lineThickness);
-                                cb.setColorStroke(line);
+                                cb.setColorStroke(SwingConversions.toSwingColor(line));
                                 cb.fillStroke();
                         } else {
@@ -257 +259 @@
                         } else {
                                 cb.setLineWidth(lineThickness);
-                                cb.setColorStroke(line);
+                                cb.setColorStroke(SwingConversions.toSwingColor(line));
                                 cb.stroke();
                         }
@@ -269 +271 @@
                 if (hasLink) {
                         
-                        Color lineColor = Color.BLACK, fillColor = null;
-                        Polygon poly = i.getLinkPoly();
-                        poly = new Polygon(poly.xpoints, poly.ypoints, poly.npoints);
+                        Colour lineColor = Colour.BLACK, fillColor = null;
+                        PolygonBounds poly = new PolygonBounds(i.getLinkBounds().getPolygon(16));
                         poly.translate((int) (x - Item.LEFT_MARGIN), (int) (_height - y - i.getBoundsHeight() / 2));
                         
@@ -298 +299 @@
         protected void writeText(Text text) throws IOException {
                 PdfContentByte cb = _pdfWriter.getDirectContent();
-                Font font = FontFactory.getFont(
-                                Conversion.getPdfFont(text.getFamily()), text.getSize(), text
-                                                .getPaintFont().getStyle(), text.getPaintColor());
+                Font font = FontFactory.getFont(Conversion.getPdfFont(text.getFamily()),
+                                                                                text.getSize(),
+                                                                                SwingConversions.toSwingFontStyle(text.getPaintFont().getStyle()),
+                                                                                SwingConversions.toSwingColor(text.getPaintColor()));
                 
                 // we draw some text on a certain position
@@ -318 +320 @@
                 try {
                         PdfContentByte cb = _pdfWriter.getDirectContent();
-                        com.lowagie.text.Image iTextImage = com.lowagie.text.Image.getInstance(image, null);
+                        com.lowagie.text.Image iTextImage = com.lowagie.text.Image.getInstance(SwingMiscManager.getIfUsingSwingImageManager().getInternalImage(image), null);
                         float angle = (float) (pic.getRotate() * Math.PI / 180);
                         double sin = Math.sin(angle), cos = Math.cos(angle);
@@ -339 +341 @@
                 PdfContentByte cb = _pdfWriter.getDirectContent();
                 cb.circle(circle.getCenter().getX(), _pdfWriter.getPageSize().getHeight() - circle.getCenter().getY(), (float) circle.getRadius());
-                cb.setColorFill(circle.getFillColor());
+                cb.setColorFill(SwingConversions.toSwingColor(circle.getFillColor()));
                 if(circle.getThickness() > 0) {
                         cb.setLineWidth(circle.getThickness());
-                        cb.setColorStroke(circle.getPaintColor());
+                        cb.setColorStroke(SwingConversions.toSwingColor(circle.getPaintColor()));
                         cb.fillStroke();
                 } else {
@@ -377 +379 @@
                         }
                         cb.closePath();
-                        Color fill = currentItem.getFillColor();
+                        Colour fill = currentItem.getFillColor();
                         if(fill != null) {
-                        cb.setColorFill(fill);
+                        cb.setColorFill(SwingConversions.toSwingColor(fill));
                         if(currentItem.getThickness() > 0) {
                                 cb.setLineWidth(currentItem.getThickness());
-                                cb.setColorStroke(currentLine.getPaintColor());
+                                cb.setColorStroke(SwingConversions.toSwingColor(currentLine.getPaintColor()));
                                 cb.fillStroke();
                         } else {
@@ -389 +391 @@
                         } else if(currentItem.getThickness() > 0) {
                                 cb.setLineWidth(currentItem.getThickness());
-                                cb.setColorStroke(currentLine.getPaintColor());
+                                cb.setColorStroke(SwingConversions.toSwingColor(currentLine.getPaintColor()));
                                 cb.stroke();
                         }
@@ -403 +405 @@
                                         if(l.getThickness() >= 0) {
                                                 cb.setLineWidth(l.getThickness());
-                                                cb.setColorStroke(l.getPaintColor());
+                                                cb.setColorStroke(SwingConversions.toSwingColor(l.getPaintColor()));
                                                 cb.stroke();
                                         }