Changeset 1102 for trunk/src/org/expeditee/importer/pdfImporter.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/importer/pdfImporter.java (modified) (10 diffs)

trunk/src/org/expeditee/importer/pdfImporter.java

@@ -19 +19 @@
 package org.expeditee.importer;
 
-import java.awt.Color;
-import java.awt.Graphics;
-import java.awt.Image;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
@@ -31 +25 @@
 import java.nio.channels.FileChannel;
 
-import javax.imageio.ImageIO;
-
-import org.expeditee.gui.Browser;
+import org.expeditee.core.Colour;
+import org.expeditee.core.Image;
+import org.expeditee.core.Point;
+import org.expeditee.gio.DragAndDropManager;
+import org.expeditee.gio.EcosystemManager;
+import org.expeditee.gio.GraphicsManager;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameCreator;
@@ -54 +52 @@
                 final int x = 0;
                 final int y = 60;
-                final int width = Browser._theBrowser.getSize().width;
+                final int width = EcosystemManager.getGraphicsManager().getWindowSize().width;
                 System.out.println(width);
                 
@@ -65 +63 @@
                 }
                 
-                final Text link = FrameDNDTransferHandler.importString(name, location);
+                final Text link = DragAndDropManager.importString(name, location);
                 link.setLink(name+"1");
                 
@@ -97 +95 @@
                                         Frame _currentFrame=null;
                                         Text nextButton=null, prevButton=null;
-                                        final float spacing=((Text)FrameCreator.createButton("Next", null, null, 10F, 10F)).getBoundsWidth() + 30F;
+                                        final int spacing=((Text)FrameCreator.createButton("Next", null, null, 10, 10)).getBoundsWidth() + 30;
                       
                       //make images from the pdf pages, write frames with those images
@@ -128 +126 @@
                               }
                               //generate the image
-                              Image img = page.getImage(w, h, //width & height
-                                      new Rectangle(0, 0, (int)page.getBBox().getWidth(), (int)page.getBBox().getHeight()), //clip rect
-                                      null, //null for the ImageObserver
-                                      true, //fill background with white
-                                      true //block until drawing is done
-                                      );
+                              Image img = Image.createImage(w, h, page);
                               //Create a buffered image to store the image in
-                              BufferedImage bimg = new BufferedImage(img.getWidth(null), img.getHeight(null), BufferedImage.TYPE_INT_RGB);
-                              Graphics g = bimg.createGraphics();
+                              Image bimg = Image.createImage(img.getWidth(), img.getHeight(), false);
+                              GraphicsManager g = EcosystemManager.getGraphicsManager();
                               //Paint the image onto the buffered image
-                              g.drawImage(img, 0, 0, null);
-                              g.dispose();
+                              g.pushDrawingSurface(bimg);
+                              g.drawImage(img, new Point(0, 0));
+                              g.popDrawingSurface();
                               //save it as a file
                               File out = new File(framesetPath+i+".png");
-                              ImageIO.write(bimg, "png", out);
+                              bimg.writeToDisk("png", out);
                               //generate a frame with that image
                               System.out.println(width);
@@ -150 +144 @@
                                                 {
                                                   //put a next button on the previous frame (points to current frame)
-                                                  nextButton=(Text)FrameCreator.createButton("Next", null, null, 10F, 10F);
+                                                  nextButton=(Text)FrameCreator.createButton("Next", null, null, 10, 10);
                                                         nextButton.setID(_currentFrame.getNextItemID());
                                                         nextButton.addAction("next");
                                                         _currentFrame.addItem(nextButton);
                                                         //put a previous button on the current frame (points to previous frame)
-                                                        prevButton=(Text)FrameCreator.createButton("Prev", null, null, (i<pages)?spacing:10F, 10F);
+                                                        prevButton=(Text)FrameCreator.createButton("Prev", null, null, (i<pages)?spacing:10, 10);
                                                         prevButton.setID(currentFrame.getNextItemID());
                                                         prevButton.addAction("previous");
@@ -162 +156 @@
                                                 else
                                                 {
-                                                        prevButton=(Text)FrameCreator.createButton("Home", null, null, (i<pages)?spacing:10F, 10F);
+                                                        prevButton=(Text)FrameCreator.createButton("Home", null, null, (i<pages)?spacing:10, 10);
                                                         prevButton.setID(currentFrame.getNextItemID());
                                                         prevButton.addAction("GotoHome");
@@ -171 +165 @@
                                                 if(i<pages) currentFrame = FrameIO.CreateFrame(frameset.getFramesetName(), name, null);
                                         }
-                                        prevButton=(Text)FrameCreator.createButton("Home", null, null, spacing, 10F);
+                                        prevButton=(Text)FrameCreator.createButton("Home", null, null, spacing, 10);
                                         prevButton.setID(currentFrame.getNextItemID());
                                         prevButton.addAction("gotohome");
                                         currentFrame.addItem(prevButton);
                                         FrameIO.SaveFrame(currentFrame,true);
-                                        MessageBay.displayMessage(f.getName() + " import complete", Color.GREEN);
-                                        FrameGraphics.requestRefresh(true);
+                                        MessageBay.displayMessage(f.getName() + " import complete", Colour.GREEN);
+                                        DisplayController.requestRefresh(true);
                                 } catch (Exception e) {
                                         e.printStackTrace();
@@ -184 +178 @@
                         }
                 }.start();
-                FrameGraphics.refresh(true);
+                DisplayController.requestRefresh(true);
                 //return source;
                 return link;