Changeset 121 for trunk/src/org/expeditee/gui/Frame.java

Timestamp:

07/03/08 16:48:09 (16 years ago)

Author:

bjn8

Message:

Added invalidation for graphics... biiiig commit. LOts of effeciency improvements - now can animate

File:

• trunk/src/org/expeditee/gui/Frame.java (modified) (10 diffs)

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

@@ -24 +24 @@
 import org.expeditee.items.InteractiveWidget;
 import org.expeditee.items.Item;
+import org.expeditee.items.ItemAppearence;
 import org.expeditee.items.ItemParentStateChangedEvent;
 import org.expeditee.items.ItemUtils;
@@ -99 +100 @@
         // Note: Needs to be able to be iterated through (for painting)
         private List<Item> _body = new ArrayList<Item>();
-
-        public static List<Item> FreeItems = new ArrayList<Item>();
 
         // for drawing purposes
@@ -660 +659 @@
                 _body.add(item);
                 item.setParent(this);
+                item.invalidateCommonTrait(ItemAppearence.Added);
 
                 // If the item is a line end and has constraints with items already
@@ -717 +717 @@
                                         _iWidgets.remove(((WidgetCorner) item).getWidgetSource());
                                 }
-                        }
+                                item.invalidateCommonTrait(ItemAppearence.Removed);
+                        }
+                        
                 }
         }
@@ -862 +864 @@
                 _background = back;
                 change();
-                // FrameGraphics.Repaint();
+                
+                if (this == DisplayIO.getCurrentFrame()) {
+                        FrameGraphics.refresh(false);
+                }
         }
 
@@ -1012 +1017 @@
                                         toAdd.permission));
                         _vectorItems.add(i);
+                        i.invalidateAll();
+                        i.invalidateFill();
                 }
                 return true;
@@ -1097 +1104 @@
         public void clearVectors() {
                 _vectors.clear();
+                
+                for (Item i : _vectorItems) { // TODO: Rethink where this should live
+                        i.invalidateAll();
+                        i.invalidateFill();
+                }
                 _vectorItems.clear();
+                
         }
 
@@ -1104 +1117 @@
                         return false;
                 for (Item i : toRemove.Frame.getVectorItems()) {
+                        i.invalidateAll();
+                        i.invalidateFill();
                         _overlayItems.remove(i);
                         i.onParentStateChanged(new ItemParentStateChangedEvent(this,
                                         ItemParentStateChangedEvent.EVENT_TYPE_REMOVED_VIA_OVERLAY,
                                         toRemove.permission));
+                        
                 }
                 return true;
@@ -1142 +1158 @@
                 }
         }
-
+        
         public void addAllOverlays(Collection<Overlay> overlays) {
                 for (Overlay o : overlays) {
@@ -1396 +1412 @@
 
         public static boolean rubberbandingLine() {
-                return FreeItems.size() == 2
-                                && (FreeItems.get(0) instanceof Line || FreeItems.get(1) instanceof Line);
+                return FreeItems.getInstance().size() == 2
+                                && (FreeItems.getInstance().get(0) instanceof Line || FreeItems.getInstance().get(1) instanceof Line);
         }
 
         public static boolean itemAttachedToCursor() {
-                return FreeItems.size() > 0;
+                return FreeItems.getInstance().size() > 0;
         }
 
         public static boolean textItemAttachedToCursor() {
-                return itemAttachedToCursor() && FreeItems.get(0) instanceof Text;
+                return itemAttachedToCursor() && FreeItems.getInstance().get(0) instanceof Text;
         }
 
         public static Item getItemAttachedToCursor() {
                 if (itemAttachedToCursor())
-                        return FreeItems.get(0);
+                        return FreeItems.getInstance().get(0);
 
                 return null;