Changeset 1102 for trunk/src/org/expeditee/io/PdfFramesetWriter.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/PdfFramesetWriter.java (modified) (8 diffs)

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

@@ -19 +19 @@
 package org.expeditee.io;
 
-import java.awt.Dimension;
 import java.awt.Graphics2D;
-import java.awt.Image;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -28 +26 @@
 import java.util.List;
 
+import org.expeditee.core.Dimension;
+import org.expeditee.core.Image;
+import org.expeditee.gio.EcosystemManager;
+import org.expeditee.gio.GraphicsManager;
+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;
@@ -35 +40 @@
 import org.expeditee.items.Picture;
 import org.expeditee.items.Text;
-import org.expeditee.items.widgets.InteractiveWidget;
+import org.expeditee.items.widgets.Widget;
 import org.expeditee.settings.UserSettings;
 
@@ -59 +64 @@
         private boolean _showFrameNames;
 
-        public PdfFramesetWriter(long firstFrame, long maxFrame,
-                        boolean showFrameNames) {
+        public PdfFramesetWriter(long firstFrame, long maxFrame, boolean showFrameNames)
+        {
                 super(firstFrame, maxFrame);
-                Dimension d = FrameGraphics.getMaxSize();
+                Dimension d = DisplayController.getFramePaintArea().getSize();
                 _pdfDocument = new Document(new Rectangle(d.width, d.height));
                 _showFrameNames = showFrameNames;
@@ -130 +135 @@
                 // we tell the ContentByte we're ready to draw text
                 cb.beginText();
-                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()));
                 cb.setFontAndSize(font.getBaseFont(), text.getSize());
                 // cb.setColorStroke(text.getPaintColor());
-                cb.setColorFill(text.getPaintColor());
+                cb.setColorFill(SwingConversions.toSwingColor(text.getPaintColor()));
 
                 // we draw some text on a certain position
@@ -158 +164 @@
                         PdfContentByte cb = _pdfWriter.getDirectContent();
                         com.lowagie.text.Image iTextImage = com.lowagie.text.Image
-                                        .getInstance(image, null);
+                                        .getInstance(SwingMiscManager.getIfUsingSwingImageManager().getInternalImage(image), null);
                         iTextImage.setAbsolutePosition(pic.getX(), _pdfWriter.getPageSize()
                                         .getHeight()
@@ -175 +181 @@
 //                      cb.setColorFill(fill);
 //              }
-                Graphics2D g = cb.createGraphicsShapes(
+/*              Graphics2D g = cb.createGraphicsShapes(
                                 FrameGraphics.getMaxSize().width,
-                                FrameGraphics.getMaxSize().height);
-                lineEnd.paint(g);
+                                FrameGraphics.getMaxSize().height);*/
+                GraphicsManager g = EcosystemManager.getGraphicsManager();
+                Image temp = EcosystemManager.getImageManager().createImage(DisplayController.getFramePaintArea().getSize());
+                lineEnd.paint();
 //              if (fill != null) {
 //                      g.setPaint(fill);
@@ -191 +199 @@
         
         @Override
-        protected void writeCircle(Circle toWrite) throws IOException {
-                PdfContentByte cb = _pdfWriter.getDirectContent();
-                Graphics2D g = cb.createGraphicsShapes(
-                                FrameGraphics.getMaxSize().width,
-                                FrameGraphics.getMaxSize().height);
-                toWrite.paint(g);
+        protected void writeCircle(Circle toWrite) throws IOException
+        {
+                PdfContentByte cb = _pdfWriter.getDirectContent();
+                Graphics2D g = cb.createGraphicsShapes(DisplayController.getFramePaintArea().getWidth(), DisplayController.getFramePaintArea().getHeight());
+                Image temp = EcosystemManager.getImageManager().createImage(DisplayController.getFramePaintArea().getSize());
+                EcosystemManager.getGraphicsManager().pushDrawingSurface(temp);
+                toWrite.paint();
+                EcosystemManager.getGraphicsManager().popDrawingSurface();
+                g.drawImage(SwingMiscManager.getIfUsingSwingImageManager().getInternalImage(temp), 0, 0, null);
         }
         
-        
-        @Override
-        protected void writeWidget(InteractiveWidget toWrite) throws IOException {
-                PdfContentByte cb = _pdfWriter.getDirectContent();
-                Graphics2D g = cb.createGraphicsShapes(
-                                FrameGraphics.getMaxSize().width,
-                                FrameGraphics.getMaxSize().height);
-                toWrite.paint(g);
+        @Override
+        protected void writeWidget(Widget toWrite) throws IOException
+        {
+                PdfContentByte cb = _pdfWriter.getDirectContent();
+                Graphics2D g = cb.createGraphicsShapes(DisplayController.getFramePaintArea().getWidth(), DisplayController.getFramePaintArea().getHeight());
+                Image temp = EcosystemManager.getImageManager().createImage(DisplayController.getFramePaintArea().getSize());
+                EcosystemManager.getGraphicsManager().pushDrawingSurface(temp);
+                toWrite.paint();
+                EcosystemManager.getGraphicsManager().popDrawingSurface();
+                g.drawImage(SwingMiscManager.getIfUsingSwingImageManager().getInternalImage(temp), 0, 0, null);
         }
 }