Changeset 1436 for trunk/src/org/expeditee/importer/ImageImporter.java

Timestamp:

11/05/19 16:16:11 (5 years ago)

Author:

bnemhaus

Message:

Added the ability to copy/paste recognised files (mostly images) into Expeditee. This functionality already existed when drag n dropping, but now also works when using copy/paste.

At this stage, recognised files get imported as a approapriate Text Item. For example, a image will create a @i Text Item and attach it to your cursor. Ideally this would be the image directly. Unfortunately, items attached to the cursor (FreeItems) are not currently parsed. This is something I will discuss with David as there are confounding issues to consider. For example: surrogates...

Attached to the bottom of this commit message are my current thoughts.

Also made it so when creating a @i through DND or Copy/Paste, that @i is as relative as possible. The users image directories setting is used to achieve this.

---

• FreeItems need to be parsed...we would need to deal with primaries/surrogates in them...
• Do we want FreeItems to be parsed? If I attach an item to my cursor and then enter surrogate mode, should it change?
• My gut says no. Both because it would be work, and also because it kind of feels like a free win if we do not.
• But we do want to replace @i with images etc. Therefore, we want an old style parse for FreeItems?

File:

• trunk/src/org/expeditee/importer/ImageImporter.java (modified) (3 diffs)

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

@@ -34 +34 @@
 import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.FrameUtils;
+import org.expeditee.gui.management.ResourceManager;
 import org.expeditee.items.Item;
 import org.expeditee.items.Text;
@@ -53 +54 @@
         }
 
-        public Item importFile(File f, Point location) throws IOException {
+        public Item importFile(File f, Point location, boolean attachToFreeItems) throws IOException {
 
                 if (location == null || f == null) {
@@ -87 +88 @@
                 }
                 Text source; 
-                final Path imagePath = Paths.get(fullPath);
-                final Path imagesPath = Paths.get(FrameIO.IMAGES_PATH);
-                if(imagePath.startsWith(imagesPath))
-                        source = DragAndDropManager.importString("@i: " + imagePath.getFileName() + size, location);
-                else source = DragAndDropManager.importString("@i: " + fullPath + size, location);
+                Path imagePath = Paths.get(fullPath);
+                Path imagePathRelitivized = ResourceManager.relativiseImagePath(imagePath, DisplayController.getCurrentFrame());
+                source = DragAndDropManager.importString("@i: " + imagePathRelitivized.toString() + size, location, attachToFreeItems);
+//              final Path imagesPath = Paths.get(FrameIO.IMAGES_PATH);
+//              if(imagePath.startsWith(imagesPath)) {
+//                      source = DragAndDropManager.importString("@i: " + imagePath.getFileName() + size, location, attachToFreeItems);
+//              } else { 
+//                      source = DragAndDropManager.importString("@i: " + fullPath + size, location, attachToFreeItems);
+//              }
                 source.setThickness(thickness);
                 source.setBorderColor(borderColor);