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

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

@@ -19 +19 @@
 package org.expeditee.io;
 
-import java.awt.Image;
-import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.util.List;
 
 import org.expeditee.actions.Misc;
+import org.expeditee.core.Dimension;
+import org.expeditee.core.Image;
+import org.expeditee.core.Point;
+import org.expeditee.gio.EcosystemManager;
+import org.expeditee.gio.GraphicsManager;
+import org.expeditee.gio.swing.SwingMiscManager;
 import org.expeditee.gui.FrameIO;
 import org.expeditee.items.FramePicture;
@@ -65 +69 @@
                         image = pic.getImage();
                         // Crop the image
-                        BufferedImage bufferedImage = new BufferedImage(pic
-                                        .getUnscaledWidth(), pic.getUnscaledHeight(),
-                                        BufferedImage.TYPE_INT_ARGB);
-                        bufferedImage.getGraphics().drawImage(image, 0, 0,
-                                        pic.getUnscaledWidth(), pic.getUnscaledHeight(),
-                                        pic.getStart().x, pic.getStart().y, pic.getEnd().x,
-                                        pic.getEnd().y, null);
+                        Image bufferedImage = Image.createImage(pic.getUnscaledWidth(), pic.getUnscaledHeight());
+                        GraphicsManager g = EcosystemManager.getGraphicsManager();
+                        g.pushDrawingSurface(bufferedImage);
+                        g.drawImage(image,
+                                                new Point(0, 0),
+                                                new Dimension(pic.getUnscaledWidth(), pic.getUnscaledHeight()),
+                                                0.0,
+                                                pic.getStart(),
+                                                new Dimension(pic.getEnd().x - pic.getStart().x, pic.getEnd().y - pic.getStart().y));
+                        g.popDrawingSurface();
                         image = bufferedImage;
                 } else {
@@ -81 +88 @@
                 // If its a bufferedImage then just write it out to the files directory
                 // This means it is probably a FrameImage
-                if (image instanceof BufferedImage) {
+                if (!image.isStoredOnDisk()) {
                         String link = pic.getAbsoluteLink();
-                        // Account for the possiblitly of an unlinked buffered image
+                        // Account for the possibility of an unlinked buffered image
                         fileName = link == null ? ("Image" + pic.getID()) : link;
-                        fileName = Misc.SaveImage((BufferedImage) image, "PNG",
-                                        FrameIO.EXPORTS_DIR + filesFolder, fileName);
+                        fileName = Misc.SaveImage(image, "PNG", FrameIO.EXPORTS_DIR + filesFolder, fileName);
                 } else {// It is a normal Image stored somewhere
                         fileName = pic.getName();