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

Timestamp:

12/10/13 10:32:52 (11 years ago)

Author:

jts21

Message:

Fix bugs with Picture creation/saving/loading

File:

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

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

@@ -4 +4 @@
 import java.awt.Desktop;
 import java.awt.Image;
+import java.awt.Point;
 import java.awt.Polygon;
 import java.awt.image.BufferedImage;
@@ -12 +13 @@
 import java.io.IOException;
 import java.io.StringReader;
-import java.io.StringWriter;
-import java.io.Writer;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -38 +37 @@
 import org.expeditee.importer.FrameDNDTransferHandler;
 import org.expeditee.io.ExaReader;
+import org.expeditee.io.ExaWriter;
 import org.expeditee.io.FrameWriter;
-import org.expeditee.io.JavaWriter;
 import org.expeditee.io.WebParser;
-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;
@@ -1393 +1390 @@
         }
         
-        public static Item testPicture(String string) {
+        public static Item testPicture() {
                 // return new Picture(string, DisplayIO.getCurrentFrame());
-                Picture p = new Picture(DisplayIO.getCurrentFrame().getNextItemID());
+                Picture p = new Picture("/home/jts21/wallpaper.png", DisplayIO.getCurrentFrame());
+                p.setPosition(149, 189);
+                p.setCropStart(new Point(100, 100));
+                p.setCropEnd(new Point(200, 200));
+                p.setWidth(100);
                 // 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);