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

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

@@ -19 +19 @@
 package org.expeditee.importer;
 
-import java.awt.Color;
-import java.awt.Point;
-import java.awt.Rectangle;
 import java.io.File;
 import java.io.IOException;
@@ -27 +24 @@
 import java.util.HashSet;
 
-import org.expeditee.gui.DisplayIO;
-import org.expeditee.gui.FrameKeyboardActions;
-import org.expeditee.gui.FrameMouseActions;
+import org.expeditee.core.Colour;
+import org.expeditee.core.Point;
+import org.expeditee.core.bounds.AxisAlignedBoxBounds;
+import org.expeditee.gio.DragAndDropManager;
+import org.expeditee.gio.gesture.StandardGestureActions;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.FrameUtils;
 import org.expeditee.items.Item;
@@ -65 +65 @@
                 }
 
-                Color borderColor = null;
+                Colour borderColor = null;
                 float thickness = 0;
                 String size = "";
@@ -72 +72 @@
                         for (Item i : enclosure) {
                                 if (i.isLineEnd() && i.isEnclosed()) {
-                                        DisplayIO.getCurrentFrame().removeAllItems(enclosure);
-                                        Rectangle rect = i.getEnclosedRectangle();
+                                        DisplayController.getCurrentFrame().removeAllItems(enclosure);
+                                        AxisAlignedBoxBounds rect = i.getEnclosedBox();
                                         size = " " + Math.round(rect.getWidth());
-                                        location = new Point(rect.x, rect.y);
+                                        location = new Point(rect.getMinX(), rect.getMinY());
                                         thickness = i.getThickness();
                                         borderColor = i.getColor();
@@ -81 +81 @@
                                 }
                         }
-                        FrameMouseActions.deleteItems(enclosure, false);
+                        StandardGestureActions.deleteItems(enclosure, false);
                 }
 
-                Text source = FrameDNDTransferHandler.importString("@i: " + fullPath
-                                + size, location);
+                Text source = DragAndDropManager.importString("@i: " + fullPath + size, location);
                 source.setThickness(thickness);
                 source.setBorderColor(borderColor);
 
-                FrameKeyboardActions.Refresh();
+                StandardGestureActions.Refresh();
                 Collection<? extends XRayable> pictures = source.getEnclosures();
                 if (pictures.size() == 0)