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

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

@@ -24 +24 @@
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 
 import org.expeditee.core.Colour;
@@ -37 +39 @@
 import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.MessageBay;
+import org.expeditee.gui.management.ResourceManager;
 import org.expeditee.items.Item;
 import org.expeditee.items.Text;
@@ -45 +48 @@
 public class pdfImporter implements FileImporter {
         
-        public Item importFile(final File f, Point location) throws IOException {
+        public Item importFile(final File f, Point location, boolean attachToFreeItems) throws IOException {
                 if (location == null || f == null) {
                         return null;
@@ -63 +66 @@
                 }
                 
-                final Text link = DragAndDropManager.importString(name, location);
+                final Text link = DragAndDropManager.importString(name, location, false);
                 link.setLink(name+"1");
                 
@@ -135 +138 @@
                               g.popDrawingSurface();
                               //save it as a file
-                              File out = new File(framesetPath+i+".png");
+                              Path p = Paths.get(framesetPath+i+".png");
+                              p = ResourceManager.relativiseImagePath(p, DisplayController.getCurrentFrame());
+                              File out = p.toFile();
                               bimg.writeToDisk("png", out);
                               //generate a frame with that image
                               System.out.println(width);
-                              System.out.println("@i: "+framesetPath+i+".png "+width);
-                                                currentFrame.addText(x, y, "@i: "+framesetPath+i+".png "+width, null);
+                              System.out.println("@i: "+p.toString()+width);
+                                                currentFrame.addText(x, y, "@i: "+p.toString()+width, null);
                                                 if(i>1)
                                                 {