Changeset 115 for trunk/src/org/expeditee/gui/FrameGraphics.java

Timestamp:

07/02/08 12:38:54 (16 years ago)

Author:

ra33

Message:

added functionality for dockable @v's

File:

• trunk/src/org/expeditee/gui/FrameGraphics.java (modified) (14 diffs)

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

@@ -12 +12 @@
 import java.awt.Point;
 import java.awt.RenderingHints;
-import java.awt.geom.Point2D;
 import java.awt.image.BufferedImage;
 import java.awt.image.VolatileImage;
@@ -19 +18 @@
 import java.util.Comparator;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -32 +30 @@
 import org.expeditee.items.ItemUtils;
 import org.expeditee.items.Line;
-import org.expeditee.items.Picture;
 import org.expeditee.items.Text;
 import org.expeditee.items.WidgetEdge;
@@ -71 +68 @@
         public static final Color ERROR_COLOR = Color.red;
 
-        private static int _Mode = MODE_NORMAL;
+        // Start in XRay mode so that errors arnt thrown when parsing the profile
+        // frame if it has images on it
+        private static int _Mode = MODE_XRAY;
 
         // if true, error messages are not shown to the user
@@ -96 +95 @@
                         _Mode = MODE_AUDIENCE;
                         ItemUtils.UpdateConnectedToAnnotations(current.getItems());
-                        for (Overlay o : current.getOverlaysDeep()) {
+                        for (Overlay o : current.getOverlays()) {
                                 ItemUtils.UpdateConnectedToAnnotations(o.Frame.getItems());
                         }
@@ -213 +212 @@
                 if (!isAudienceMode()
                                 || (isAudienceMode() && !i.isConnectedToAnnotation() && !i
-                                                .isAnnotation()) || i == FrameUtils.LastEdited) {
+                                                .isAnnotation()) || i == FrameUtils.getLastEdited()) {
 
                         Graphics2D tg = (Graphics2D) g.create();
@@ -219 +218 @@
                         tg.dispose();
                 }
-        }
-
-        public static void AddAllOverlayItems(List<Item> items, Frame overlay,
-                        List<Frame> seenOverlays) {
-                if (seenOverlays.contains(overlay))
-                        return;
-
-                seenOverlays.add(overlay);
-
-                for (Overlay o : overlay.getOverlays())
-                        AddAllOverlayItems(items, o.Frame, seenOverlays);
-
-                items.addAll(overlay.getVisibleItems());
         }
 
@@ -250 +236 @@
          *            scaled.
          */
-        public static void AddAllVectorItems(List<Item> items, Frame vector,
-                        Collection<Frame> seenVectors, Point2D.Float origin, Float scale,
-                        Color defaultForeground, Color defaultBackground) {
-
-                // Check all the vector items and add the items on the vectors
-                if (seenVectors.contains(vector))
-                        return;
-                seenVectors.add(vector);
-
-                float originX = origin == null ? 0 : origin.x;
-                float originY = origin == null ? 0 : origin.y;
-
-                for (Vector o : vector.getVectors())
-                        AddAllVectorItems(items, o.Frame, new HashSet<Frame>(seenVectors),
-                                        new Point2D.Float(originX + o.Origin.x * scale, originY
-                                                        + o.Origin.y * scale), o.Scale * scale,
-                                        o.Foreground, o.Background);
-                // if its the original frame then were done
-                if (origin == null) {
-                        ItemUtils.EnclosedCheck(items);
-                        return;
-                }
-                // Put copies of the items shifted to the origin of the VectorTag
-                float dx = origin.x;
-                float dy = origin.y;
-                List<Item> copies = ItemUtils
-                                .CopyItems(vector.getVisibleItems(), false);
-                // FrameMouseActions
-                while (!copies.isEmpty()) {
-                        Iterator<Item> iterator = copies.iterator();
-                        Item item = iterator.next();
-                        // Dont paint annotation items for @v
-                        if (!item.isVisible() || item.isAnnotation()) {
-                                iterator.remove();
-                                continue;
-                        }
-                        item.setLinkMark(false);
-                        item.setActionMark(false);
-                        if (!(item instanceof Line)) {
-                                item.setThickness(item.getThickness() * scale);
-                                Collection<Item> connected = item.getAllConnected();
-                                for (Item i : connected) {
-                                        if (!(i instanceof Line)) {
-                                                i.setXY(i.getX() * scale + dx, i.getY() * scale + dy);
-                                                i.setArrowheadLength(i.getArrowheadLength() * scale);
-                                                if (i.getColor() == null) {
-                                                        i.setColor(defaultForeground);
-                                                }
-                                                if (i.getBackgroundColor() == null) {
-                                                        i.setBackgroundColor(defaultBackground);
-                                                }
-                                                if (i.getFillColor() == null) {
-                                                        i.setFillColor(defaultBackground);
-                                                }
-                                                if (i instanceof Text)
-                                                        i.setSize(i.getSize() * scale);
-                                                else if (i instanceof Picture) {
-                                                        Picture p = (Picture) i;
-                                                        p.setScale(p.getScale() * scale);
-                                                }
-                                        }
-                                }
-                                items.addAll(connected);
-                                copies.removeAll(connected);
-                        } else {
-                                items.add(item);
-                        }
-                }
-        }
+//      public static void AddAllVectorItems(List<Item> items, Vector vector,
+//                      Collection<Frame> seenVectors) {
+//              // Check all the vector items and add the items on the vectors
+//              if (seenVectors.contains(vector))
+//                      return;
+//              seenVectors.add(vector);
+//
+//              float originX = origin == null ? 0 : origin.x;
+//              float originY = origin == null ? 0 : origin.y;
+//
+//              for (Vector o : vector.getVectors())
+//                      AddAllVectorItems(items, o.Frame, new HashSet<Frame>(seenVectors),
+//                                      new Point2D.Float(originX + o.Origin.x * scale, originY
+//                                                      + o.Origin.y * scale), o.Scale * scale,
+//                                      o.Foreground, o.Background);
+//              // if its the original frame then were done
+//              if (origin == null) {
+//                      ItemUtils.EnclosedCheck(items);
+//                      return;
+//              }
+//              // Put copies of the items shifted to the origin of the VectorTag
+//              items.addAll(ItemUtils
+//                              .CopyItems(vector.getNonAnnotationItems(), vector));
+//              
+//      }
 
         /**
@@ -375 +317 @@
                         // rubber-banding on older machines
                         if (UserSettings.AntiAlias)
-                                ((Graphics2D) bg).setRenderingHint(
-                                                RenderingHints.KEY_ANTIALIASING,
+                                bg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
                                                 RenderingHints.VALUE_ANTIALIAS_ON);
                         // If we are doing @f etc... then have a clear background if its the
@@ -396 +337 @@
                         List<InteractiveWidget> paintWidgets;
 
-                        AddAllVectorItems(paintItems, toPaint, new LinkedList<Frame>(),
-                                        null, 1F, null, null);
-
                         if (isActualFrame) {
                                 // Add all the items for this frame and any other from other
                                 // frames
-                                AddAllOverlayItems(paintItems, toPaint, new LinkedList<Frame>());
+                                paintItems.addAll(toPaint.getAllItems());
 
                                 paintWidgets = new LinkedList<InteractiveWidget>();
                                 AddAllOverlayWidgets(paintWidgets, toPaint,
                                                 new LinkedList<Frame>());
-
                         } else {
                                 paintItems.addAll(toPaint.getVisibleItems());
+                                paintItems.addAll(toPaint.getVectorItems());
                                 paintWidgets = toPaint.getInteractiveWidgets();
                         }
@@ -736 +674 @@
                         // Brook: Widget Edges do not have such a context
                         if (toDisconnect != null && !(i instanceof WidgetEdge)) {
-                                Item.SelectedMode newMode = toDisconnect.getSelectedMode();
+                                Item.HighlightMode newMode = toDisconnect.getHighlightMode();
                                 if (Frame.itemAttachedToCursor())
-                                        newMode = Item.SelectedMode.Normal;
+                                        newMode = Item.HighlightMode.Normal;
                                 // unhighlight all the other dots
                                 for (Item conn : toDisconnect.getAllConnected()) {
-                                        conn.setSelectedMode(Item.SelectedMode.None);
+                                        conn.setHighlightMode(Item.HighlightMode.None);
                                 }
-                                l.setSelectedMode(newMode);
+                                l.setHighlightMode(newMode);
                                 // highlight the dot that will be in disconnect mode
-                                toDisconnect.setSelectedMode(newMode);
+                                toDisconnect.setHighlightMode(newMode);
                                 i = toDisconnect;
                         } else {
                                 Collection<Item> connected = i.getAllConnected();
                                 for (Item conn : connected) {
-                                        conn.setSelectedMode(Item.SelectedMode.Connected);
+                                        conn.setHighlightMode(Item.HighlightMode.Connected);
                                 }
                         }
                 } else if (i instanceof Circle) {
-                        i.setSelectedMode(Item.SelectedMode.Connected);
+                        i.setHighlightMode(Item.HighlightMode.Connected);
                 } else {
                         // FrameGraphics.ChangeSelectionMode(i,
@@ -760 +698 @@
                         // For polygons need to make sure all other endpoints are
                         // unHighlighted
-                        ChangeSelectionMode(i, Item.SelectedMode.Normal,
-                                        Item.SelectedMode.None);
+                        changeHighlightMode(i, Item.HighlightMode.Normal,
+                                        Item.HighlightMode.None);
                 }
                 Repaint();
@@ -767 +705 @@
         }
 
-        public static void ChangeSelectionMode(Item item, Item.SelectedMode newMode) {
-                ChangeSelectionMode(item, newMode, newMode);
-        }
-
-        public static void ChangeSelectionMode(Item item,
-                        Item.SelectedMode newMode, Item.SelectedMode connectedNewMode) {
+        public static void changeHighlightMode(Item item, Item.HighlightMode newMode) {
+                changeHighlightMode(item, newMode, newMode);
+        }
+
+        public static void changeHighlightMode(Item item,
+                        Item.HighlightMode newMode, Item.HighlightMode connectedNewMode) {
                 if (item == null)
                         return;
+                // Mike: TODO comment on why the line below is used!!
+                // I forgot already!!Opps
                 boolean freeItem = Frame.FreeItems.contains(item);
                 for (Item i : item.getAllConnected()) {
-                        // Mike: TODO comment on what the line below does!!
-                        // I forgot already!!Opps
-                        if (freeItem || !Frame.FreeItems.contains(i)) {
-                                i.setSelectedMode(connectedNewMode);
-                        }
-                }
-                if (newMode != connectedNewMode)
-                        item.setSelectedMode(newMode);
+                        if (/* freeItem || */!Frame.FreeItems.contains(i)) {
+                                i.setHighlightMode(connectedNewMode);
+                        }
+                }
+                if (!freeItem && newMode != connectedNewMode)
+                        item.setHighlightMode(newMode);
                 Repaint();
         }
@@ -959 +897 @@
                                 Paint(left, right, Item.DEFAULT_BACKGROUND);
                         }
-
                         isPainting = false;
                 }