Changeset 589 for trunk/src/org/expeditee/actions

Timestamp:

12/09/13 14:42:44 (11 years ago)

Author:

jts21

Message:

EXA save format working + automatically converting save files to it's own format
Pictures are no longer XRayables, working fine except for a bug with cropping, and some problems with the default image that I need to fix.
FramePicture/FrameImage/FrameBitmap are disabled because they need to be changed to work with the modified Picture format but I don't know what they do so couldn't test them (will need to look into fixing that)

File:

• trunk/src/org/expeditee/actions/Misc.java (modified) (4 diffs)

trunk/src/org/expeditee/actions/Misc.java

@@ -43 +43 @@
 import org.expeditee.io.ExaWriter;
 import org.expeditee.io.flowlayout.XGroupItem;
+import org.expeditee.items.DotType;
 import org.expeditee.items.Item;
 import org.expeditee.items.ItemUtils;
 import org.expeditee.items.Line;
+import org.expeditee.items.Picture;
 import org.expeditee.items.Text;
 import org.expeditee.items.widgets.InteractiveWidget;
@@ -1369 +1371 @@
                         fw.writeFrame(frame);
                         String contents = fw.getFileContents();
-                        System.out.println("*****\n" + contents + "*****");
                         Frame newFrame;
                         try {
@@ -1375 +1376 @@
                                 System.out.println(nextName);
                                 newFrame = new ExaReader(nextName).readFrame(new BufferedReader(new StringReader(contents)));
+                                newFrame.setChanged(true);
                                 newFrame.setPath(frame.getPath());
-                                Text text = frame.addText(100, 100, "new Frame", null);
+                                FrameIO.SaveFrame(newFrame);
+                                Text text = new Text(DisplayIO.getCurrentFrame().getNextItemID(), "New frame");
+                                text.setPosition(FrameMouseActions.MouseX, FrameMouseActions.MouseY);
                                 text.setLink(newFrame.getName());
-                                FrameIO.SaveFrame(newFrame);
+                                FrameMouseActions.pickup(text);
+                                
                         } catch (Exception e) {
                                 e.printStackTrace();
                         }
-                        System.out.println("*****");
 
         } catch (Exception e) {
@@ -1388 +1392 @@
         }
         }
+        
+        public static Item testPicture(String string) {
+                // return new Picture(string, DisplayIO.getCurrentFrame());
+                Picture p = new Picture(DisplayIO.getCurrentFrame().getNextItemID());
+                // p.setPosition(100, 100);
+                // p.scale(0.1F, (int)FrameMouseActions.MouseX, (int)FrameMouseActions.MouseY);
+                p.setDateCreated("09Dec2013[12:17.43]");
+                p.setPosition(149, 189);
+                p.setGradientAngle(0);
+                p.setDotType(DotType.square);
+                p.setSize(18.f);
+                p.setImageSource("/home/jts21/wallpaper.png");
+                p.setScale(0.1f);
+                
+                // p.setImageSource(string);
+                return p;
+        }
+        
+        public static void getAllItems(Frame frame) {
+                System.out.println(frame.getAllItems());
+        }
+        
+        public static void getItemsToSave(Frame frame) {
+                System.out.println(frame.getItemsToSave());
+        }
 }