Changeset 740 for trunk/src/org/expeditee/agents/Format.java

Timestamp:

01/22/14 16:45:34 (10 years ago)

Author:

jts21

Message:

Modify the undo stack to use a stack of List rather than a stack of connected items (easier to understand, and since we have to parse it linearly anyways it's not any slower)
Also started making other stuff undo-able, so far vertical auto-format can be undone, probably pretty inefficient (every time I add to the list of items modified by the vertical format I have to walk the entire list of modified items to make sure I don't add it multiple times).
I think it might be a good idea to add a redo functionality as well (simple enough to do, but we need a key/mouse binding for it)
Also modified copy/pasting to fix a bug where cutting a point on a shape would leave the rest of the shape on the screen (and broken). Now it just takes the whole shape (again, this is done inefficiently since for every item we walk the entire list of known items to see if we've seen it before. IDK if that will need to be rewritten to speed it up somehow).

File:

• trunk/src/org/expeditee/agents/Format.java (modified) (3 diffs)

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

@@ -51 +51 @@
                 // same box as the cursor
                 Collection<Text> itemsToFormat = getItemsToFormat(start);
+                
+                List<Item> changedItems = new ArrayList<Item>();
 
                 ArrayList<Item> columnHeads = new ArrayList<Item>();
@@ -129 +131 @@
 
                         if (xCheck < FrameGraphics.getMaxSize().width) {
-                                if (columnHeads.get(i + 1).getX() < maxX
-                                                && columnHeads.get(i + 1).getY() < maxY)
-                                        columnHeads.get(i + 1).setX(maxX);
-
-                                for (Item it : columns.get(i + 1))
-                                        if (it.getX() < maxX && it.getY() < maxY)
+                                Item columnHead = columnHeads.get(i + 1);
+                                if (columnHead.getX() < maxX && columnHead.getY() < maxY) {
+                                        if(columnHead.getX() != maxX && !changedItems.contains(columnHead)) {
+                                                Item copy = columnHead.copy();
+                                                copy.setID(columnHead.getID());
+                                                changedItems.add(copy);
+                                        }
+                                        columnHead.setX(maxX);
+                                }
+
+                                for (Item it : columns.get(i + 1)) {
+                                        if (it.getX() < maxX && it.getY() < maxY) {
+                                        if(it.getX() != maxX && !changedItems.contains(it)) {
+                                                Item copy = it.copy();
+                                                copy.setID(it.getID());
+                                                changedItems.add(copy);
+                                        }
                                                 it.setX(maxX);
-                        }
-
-                        res = FrameUtils.Align(columns.get(i + 1), true, _adjust);
+                                        }
+                                }
+                        }
+                        
+                        res = FrameUtils.Align(columns.get(i + 1), true, _adjust, changedItems);
                         _success = _success && (res >= 0);
                 }
@@ -148 +163 @@
                  */
                 start.setChanged(true);
+                start.addToUndo(changedItems);
                 FrameGraphics.requestRefresh(true);
                 return null;