Changeset 58

Timestamp:

05/16/08 11:17:55 (16 years ago)

Author:

ra33

Message:

Items that are completely off the screen to the left or above are no longer saved in the file

Location:

trunk/src/org/expeditee

Files:

• agents/Format.java (modified) (4 diffs)
• gui/DisplayIO.java (modified) (1 diff)
• gui/FrameMouseActions.java (modified) (1 diff)
• io/ExpWriter.java (modified) (4 diffs)
• items/Item.java (modified) (1 diff)

trunk/src/org/expeditee/agents/Format.java

@@ -10 +10 @@
 import org.expeditee.gui.FrameUtils;
 import org.expeditee.items.Item;
+import org.expeditee.items.Text;
 
 /**
@@ -38 +39 @@
                         e.printStackTrace();
                 }
-
         }
 
@@ -46 +46 @@
 
                 ArrayList<ArrayList<Item>> columns = new ArrayList<ArrayList<Item>>();
-                for (int j = 0; j < start.getItems().size(); j++) {
-                        Item i = start.getItems().get(j);
 
-                        if (j > 0 && start.isNormalTextItem(i)) {
-                                int col = findColumn(columnHeads, i);
-                                // if this is the head of a new column
-                                if (col < 0) {
-                                        columnHeads.add(i);
-                                        columns.add(new ArrayList<Item>());
-                                        // otherwise the column for this item has already been
-                                        // found set the column to be the one we just added...
-                                        col = columns.size() - 1;
-                                } else
-                                        columns.get(col).add(i);
-                        }
+                for (Text t : start.getBodyTextItems(true)) {
+                        int col = findColumn(columnHeads, t);
+                        // if this is the head of a new column
+                        if (col < 0) {
+                                columnHeads.add(t);
+                                columns.add(new ArrayList<Item>());
+                                // otherwise the column for this item has already been
+                                // found set the column to be the one we just added...
+                                col = columns.size() - 1;
+                        } else
+                                columns.get(col).add(t);
                 }
 
@@ -165 +162 @@
         @Override
         protected void finalise(Frame start) {
-                 if(_success) overwriteMessage("Formating complete.");
+                if (_success)
+                        overwriteMessage("Formating complete.");
         }
 

trunk/src/org/expeditee/gui/DisplayIO.java

@@ -61 +61 @@
          * The title to display in the Title bar.
          */
-        public static final String TITLE = "Exp15May2008A";
+        public static final String TITLE = "Exp16May2008A";
 
         private DisplayIO() {

trunk/src/org/expeditee/gui/FrameMouseActions.java

@@ -1312 +1312 @@
          */
         private static boolean rubberBanding() {
-                if (Frame.FreeItems.size() < 2) {
+                if (Frame.FreeItems.size() != 2) {
                         return false;
                 }

trunk/src/org/expeditee/io/ExpWriter.java

@@ -1 +1 @@
 package org.expeditee.io;
 
+import java.awt.Rectangle;
 import java.io.File;
 import java.io.FileWriter;
@@ -215 +216 @@
                 _stringWriter.append(toWrite);
         }
-
+        
         // writes the given Item out to the file
         // This method is not used to write out LINE items
@@ -221 +222 @@
                 if (_writer == null)
                         return;
+
+                // Dont save the item if it is off the screen
+                if (item.offScreen()) {
+                        System.out.println("item offscreen!");
+                        return;
+                }
 
                 // Pictures are saved as the corresponding text items that created them
@@ -228 +235 @@
                         item = ((WidgetCorner) item).getWidgetSource().getSource();
 
-                if (item.getLines().size() > 0)
+                if (item.isLineEnd())
                         writePoint(item);
                 else if (!(item instanceof Line))

trunk/src/org/expeditee/items/Item.java

@@ -1552 +1552 @@
                 }
         }
+        
+        /**
+         * Checks if this item is off the left or top of the screen
+         * @return
+         */
+        public boolean offScreen() {
+                Rectangle itemRect = getArea().getBounds();
+                //Check that the bottom right corner of this item is on the screen
+                if (itemRect.x + itemRect.width >= 0 && itemRect.y + itemRect.height >= 0)
+                        return false;
+                //Check if all the items it is connected to are offscreen
+                for(Item i: getAllConnected()){
+                        Rectangle iRect = i.getArea().getBounds();
+                        //Check that the bottom right corner of this item is on the screen
+                        if (iRect.x + iRect.width >= 0 && iRect.y + iRect.height >= 0) {
+                                return false;
+                        }
+                }
+                return true;
+        }
 }