Changeset 108 for trunk/src/org/expeditee/items/Item.java

Timestamp:

06/27/08 16:44:21 (16 years ago)

Author:

ra33

Message:

Heaps of changes!!!!
Added circles...
Better drawing of lines etc etc

File:

• trunk/src/org/expeditee/items/Item.java (modified) (43 diffs)

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

@@ -9 +9 @@
 import java.awt.Polygon;
 import java.awt.Rectangle;
+import java.awt.Stroke;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Area;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.ConcurrentModificationException;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
@@ -39 +43 @@
 public abstract class Item implements Comparable<Item>, Runnable {
 
+        public static final Float DEFAULT_THICKNESS = 2f;
+
+        public static final Float MINIMUM_THICKNESS = 1f;
+
         protected final int JOIN = BasicStroke.JOIN_ROUND;
 
         protected final int CAP = BasicStroke.CAP_BUTT;
-        
+
+        protected final Stroke HIGHLIGHT_STROKE = new BasicStroke(
+                        MINIMUM_THICKNESS, CAP, JOIN, 4.0F);
+
         // contains all dots (including this one) that form an enclosure
         // if this dot is part of an enclosing shape
@@ -49 +60 @@
         public static final int LEFT_MARGIN = 13;
 
+        // indicates which end the arrowhead should be drawn at
+        protected Polygon _poly = null;
+
         protected boolean _connectedToAnnotation = false;
-
-        public static final int PERMISSION_NONE = 0;
-
-        public static final int PERMISSION_FOLLOW_LINKS = 1;
-
-        public static final int PERMISSION_COPY = 2;
-
-        public static final int PERMISSION_TDFC = 3;
-
-        public static final int PERMISSION_FULL = 4;
 
         public static final int NEAR_DISTANCE = 15;
@@ -103 +107 @@
          * this Item.
          */
-        public static Color[] COLOR_WHEEL = { Color.RED, Color.BLUE, Item.GREEN,
-                        Color.MAGENTA, Color.YELLOW.darker(), Color.BLACK, Color.DARK_GRAY,
-                        Color.GRAY, Color.WHITE, null };
-
+        public static Color[] COLOR_WHEEL = { Color.BLACK, Color.RED, Color.BLUE,
+                        Item.GREEN, Color.MAGENTA, Color.YELLOW.darker(), Color.WHITE };
+
+        // TODO Have shift toggle through a black and white color wheel?
         public static Color[] FILL_COLOR_WHEEL = { new Color(255, 150, 150),
                         new Color(150, 150, 255), new Color(150, 255, 150),
                         new Color(255, 150, 255), new Color(255, 255, 100), Color.WHITE,
-                        Color.GRAY, Color.DARK_GRAY, Color.BLACK, null };
+                         Color.BLACK};
+                                                                                                                                 /* Color.GRAY,
+                                                                                                                                 * Color.DARK_GRAY,
+                                                                                                                                 */
 
         public static final int UNCHANGED_CURSOR = -100;
@@ -167 +174 @@
 
                 dest.setParent(source.getParent());
-                dest._mode = SelectedMode.None;
-                dest._lastMode = source._mode;
-
+                dest._mode = source._mode;// SelectedMode.None;
+                dest._visible = source._visible;
                 Frame parent = source.getParentOrCurrentFrame();
                 // TODO MIKE says maybe we could tighten up and only give items ID's if
@@ -199 +205 @@
         private Point _offset = new Point(0, 0);
 
-        private float _x;
-
-        private float _y;
+        protected float _x;
+
+        protected float _y;
 
         private int _id;
@@ -229 +235 @@
         private List<String> _actionLeaveFrame = null;
 
-        public int Permission = PERMISSION_FULL;
+        public Permission _permission = Permission.full;
+        
+        public void setPermission(Permission permission){
+                _permission = permission;
+        }
+        
+        public boolean hasPermission(Permission permission){
+                return _permission.ordinal() >= permission.ordinal();
+        }
 
         // A fill color of null represents transparent
@@ -256 +270 @@
 
         // arrowhead parameters
-        private int _arrowheadLength = 0;
+        private float _arrowheadLength = 0;
 
         private double _arrowheadRatio = DEFAULT_ARROWHEAD_RATIO;
@@ -283 +297 @@
 
         private boolean _visible = true;
-
-        private SelectedMode _lastMode = SelectedMode.None;
 
         private float _thickness = -1.0F;
@@ -303 +315 @@
                 }
 
-                if (_actions == null)
+                if (_actions == null){
+                        _poly = null;
                         _actions = new LinkedList<String>();
+                }
                 _actions.add(action);
         }
@@ -312 +326 @@
                         connected.add(this);
 
-                for (Line line : getLines()) {
-                        if (!connected.contains(line))
-                                line.addAllConnected(connected);
+                for (Item item : getConnected()) {
+                        if (!connected.contains(item))
+                                item.addAllConnected(connected);
                 }
         }
@@ -383 +397 @@
 
         public void delete() {
-                setVisible(false);
-        }
-
+                _deleted = true;
+        }
+
+        @Override
         public boolean equals(Object o) {
-                if (o instanceof Item) {
+                if (o == null)
+                        return false;
+                if (getClass().equals(o.getClass())) {
                         Item i = (Item) o;
                         return i.getID() == getID()
                                         && ((i.getParent() == _parent) || (i.getParent() != null && i
                                                         .getParent().equals(_parent)));
-
                 } else
                         return false;
@@ -463 +479 @@
         }
 
-        public int getArrowheadLength() {
+        public float getArrowheadLength() {
                 return _arrowheadLength;
         }
@@ -559 +575 @@
                 List<Item> conn = new LinkedList<Item>();
                 conn.add(this);
-
+                conn.addAll(getEnclosures());
                 conn.addAll(getLines());
                 return conn;
@@ -698 +714 @@
 
         public Color getPaintBackgroundColor() {
-                if (_colorBackground == null) {
+                Color colorBackground = getBackgroundColor();
+                if (colorBackground == null) {
                         if (getParent() != null && getParent().getBackgroundColor() != null)
                                 return getParent().getBackgroundColor();
@@ -705 +722 @@
                 }
 
-                return _colorBackground;
+                return colorBackground;
         }
 
@@ -713 +730 @@
          * @return The Color of this item (foreground)
          */
-        public Color getPaintColor() {
+        public final Color getPaintColor() {
                 // If color is null then get the paint foregroundColor for the frame the
                 // item is on which is a color adjusted to suit the background
-                if (_color == null) {
+                Color color = getColor();
+
+                if (color == null) {
                         if (getParent() != null)
                                 return getParent().getPaintForegroundColor();
@@ -727 +746 @@
                 }
 
-                return _color;
+                return color;
         }
 
@@ -739 +758 @@
         }
 
-        public Frame getParent() {
+        public final Frame getParent() {
                 return _parent;
         }
 
-        /**
-         * Returns the Shape that surrounds this Item representing this Item's
-         * 'gravity'.
-         * 
-         * @return The Shape (rectangle) surrounding this Item, which represents
-         *         this Items 'gravity'.
-         */
-        public abstract Polygon getPolygon();
-
-        public Point getPosition() {
+        public final Point getPosition() {
                 return new Point(getX(), getY());
         }
@@ -762 +772 @@
          * @return The size of this Item.
          */
-        public int getSize() {
-                return -1;
+        public float getSize() {
+                return -1.0F;
         }
 
@@ -809 +819 @@
         /**
          * Checks if the given Shape intersects with the Shape around this Item.
-         * Note: Both Shape objects should be rectangles for this to work properly.
          * 
          * @param s
@@ -819 +828 @@
                         return false;
 
-                // return p.getBounds().intersects(getArea().getBounds());
                 Area a = new Area(p);
-
                 a.intersect(this.getArea());
+
                 return !a.isEmpty();
         }
@@ -859 +867 @@
          */
         public boolean isHighlighted() {
+                if (isFloating())
+                        return false;
                 return _mode != SelectedMode.None;
         }
@@ -917 +927 @@
 
         public void paintFill(Graphics2D g) {
-                if (getFillColor() != null && getEnclosingDots() != null) {
-                        g.setColor(getFillColor());
+                Color fillColor = getFillColor();
+                if (fillColor != null && getEnclosingDots() != null) {
+                        if(isFloating()){
+                                //TODO experiment with adding alpha when picking up filled items...
+                                //Slows things down quite alot!!
+                                fillColor = new Color(fillColor.getRed(), fillColor.getGreen(), fillColor.getBlue());
+                        }                       
+                        g.setColor(fillColor);
                         // The painting is not efficient enough for gradients...
                         // Shape s = getEnclosedShape();
@@ -1021 +1037 @@
                 // Check if all the characters are digits and hence it is a relative
                 // link
-                for (int i = 0; i < link.length(); i++) {
-                        if (!Character.isDigit(link.charAt(i)))
-                                return;
-                }
+                if(!FrameIO.isPositiveInteger(link))
+                        return;
 
                 // Make it an absolute link
@@ -1038 +1052 @@
 
         /**
-         * Sets any action code (KMS action language) that should be associated with
+         * Sets any action code that should be associated with
          * this Item Each entry in the list is one line of code
          * 
@@ -1045 +1059 @@
          */
         public void setActions(List<String> actions) {
+                //Want to resize the highlight box for text items if actions have been added
+                _poly = null;
                 if (actions == null || actions.size() == 0)
                         _actions = null;
@@ -1075 +1091 @@
 
         public void setActionMark(boolean val) {
+                _poly = null;
                 _actionMark = val;
         }
@@ -1096 +1113 @@
          *            The ratio of the arrow's length to its width.
          */
-        public void setArrow(int length, double ratio) {
+        public void setArrow(float length, double ratio) {
                 _arrowheadLength = length;
                 _arrowheadRatio = ratio;
@@ -1106 +1123 @@
         }
 
-        public void setArrowheadLength(int length) {
+        public void setArrowheadLength(float length) {
                 _arrowheadLength = length;
                 updateArrowPolygon();
@@ -1250 +1267 @@
 
         public void setLinkMark(boolean val) {
+                _poly = null;
                 _linkMark = val;
         }
@@ -1307 +1325 @@
                 _y = y;
 
+                for (Item i : getEnclosures()) {
+                        i.updatePolygon();
+                }
                 updatePolygon();
 
@@ -1400 +1421 @@
                         return;
                 assert (_parent != null);
+                
+                if(FrameIO.isPositiveInteger(link))
+                        return;
+                
                 // Check if the link is for the current frameset
                 if (_parent.getFramesetName().equalsIgnoreCase(
@@ -1411 +1436 @@
          * Dots this is the thickness.
          */
-        public void setSize(int size) {
+        public void setSize(float size) {
         }
 
@@ -1500 +1525 @@
                 else {
                         _arrowhead = new Polygon();
-                        _arrowhead.addPoint((int) getX(), (int) getY());
+                        _arrowhead.addPoint(Math.round(getX()), Math.round(getY()));
+                        _arrowhead.addPoint((Math.round(getX() - getArrowheadLength())),
+                                        ((int) Math.round(getY()
+                                                        - (getArrowheadLength() * getArrowheadRatio()))));
+                        _arrowhead.addPoint(Math.round(getX()), (int) getY());
                         _arrowhead
                                         .addPoint(
-                                                        (int) getX() - getArrowheadLength(),
-                                                        (int) (getY() - (getArrowheadLength() * getArrowheadRatio())));
-                        _arrowhead.addPoint((int) getX(), (int) getY());
-                        _arrowhead
-                                        .addPoint(
-                                                        (int) getX() - getArrowheadLength(),
-                                                        (int) (getY() + (getArrowheadLength() * getArrowheadRatio())));
+                                                        (int) Math.round(getX() - getArrowheadLength()),
+                                                        (int) Math
+                                                                        .round((getY() + (getArrowheadLength() * getArrowheadRatio()))));
                 }
         }
 
         protected abstract void updatePolygon();
+
+        public void setHidden(boolean state) {
+                this._visible = !state;
+        }
+        
 
         public void setVisible(boolean state) {
@@ -1520 +1550 @@
 
         public boolean isVisible() {
-                return _visible;
+                return _visible && !_deleted;
         }
 
@@ -1540 +1570 @@
                 }
                 setSelectionColor(color);
-                _lastMode = _mode;
                 _mode = mode;
-        }
-
-        public void restoreLastMode(Color selectionColor) {
-                setSelectionColor(selectionColor);
-                if (_mode != SelectedMode.None)
-                        return;
-                _mode = _lastMode;
-                _lastMode = SelectedMode.None;
         }
 
@@ -1659 +1680 @@
         }
 
+        /**
+         * True if this item is the end of a line.
+         * 
+         * @return
+         */
         public boolean isLineEnd() {
+                // TODO this will need to be redone when enclosure class is added...
+                // At the moment enclosures are only circles...we dont want circle
+                // centers to be lineEnds
                 return _lines.size() > 0;
+        }
+        
+        public boolean hasEnclosures(){
+                return _enclosures.size() > 0;
         }
 
@@ -1717 +1750 @@
 
         public void setAction(String string) {
+                //Want to resize the highlight box for text items if actions are been added
+                if(_actions == null || _actions.size() == 0){
+                        _poly = null;
+                }
                 _actions = new LinkedList<String>();
                 _actions.add(string);
@@ -1732 +1769 @@
         protected void paintLink(Graphics2D g) {
                 if (getLink() != null || getAction() != null) {
+                        g.setStroke(HIGHLIGHT_STROKE);
                         if (getLink() != null && getAction() != null) {
                                 g.setColor(LINK_ACTION_COLOR);
@@ -1806 +1844 @@
                         return null;
                 // assert (_parent!= null);
+                Frame parent = getParentOrCurrentFrame();
                 if (_parent == null) {
                         // if parent is null it is an item on the message box
                         // so it must already be absolute
-                        assert (!FrameIO.isPositiveInteger(link));
-                        return link;
+                        //assert (!FrameIO.isPositiveInteger(link));
+                        //return link;
+                        
                 }
 
                 // if its a relative link then return absolute
                 if (FrameIO.isPositiveInteger(link)) {
-                        return _parent.getFramesetName() + link;
+                        return parent.getFramesetName() + link;
                 }
                 return link;
@@ -1828 +1868 @@
          *            new y position
          */
-        public void setXY(int x, int y) {
+        public void setXY(float x, float y) {
                 _x = x;
                 _y = y;
@@ -1877 +1917 @@
 
         /**
-         * Gets the size of the enclosure that this item is part of.
-         * @return the area of the box surrounding the enclosed shape that this item is part of
-         */
-        public Integer getEnclosedArea() {
+         * Gets the size of the enclosure that this item is part of. Used to
+         * determine the paint order of items, with smaller items being painted
+         * first.
+         * 
+         * @return the area of the box surrounding the enclosed shape that this item
+         *         is part of
+         */
+        public double getEnclosedArea() {
                 if (_enclosure == null)
-                        return 0;
-                Rectangle box = getEnclosedShape().getBounds();
-                Integer area = box.width * box.height;
-                
-                if (getFillColor() == null)
-                        return -area;
-                
-                return area;
+                        return 0.0;
+                Rectangle2D box = getEnclosedShape().getBounds2D();
+                return box.getWidth() * box.getHeight();
+        }
+
+        /**
+         * Returns the Shape that surrounds this Item representing this Item's
+         * 'gravity'.
+         * 
+         * @return The Shape (rectangle) surrounding this Item, which represents
+         *         this Items 'gravity'.
+         */
+        public final Polygon getPolygon() {
+                if (_poly == null)
+                        updatePolygon();
+
+                return new Polygon(_poly.xpoints, _poly.ypoints, _poly.npoints);
+        }
+
+        /**
+         * Shifts the position of the item along the line between this items
+         * location and a specified point.
+         * 
+         * @param origin
+         * @param ratio
+         */
+        public void translate(Point2D origin, double ratio) {           
+                _x = (float) (origin.getX() + ratio * (_x - origin.getX()));
+                _y = (float) (origin.getY() + ratio * (_y - origin.getY()));
+                updatePolygon();
+                for (Line line : getLines())
+                        line.updatePolygon();
+        }
+
+        private static int[] LinePatterns = new int[] { 0, 10, 20 };
+
+        /**
+         * The rotates through a wheel of dashed lines.
+         * 
+         * @param amount
+         *            number of rotations around the wheel to toggle by.
+         */
+        public void toggleDashed(int amount) {
+                // find the index of the current line pattern
+                int[] currentPattern = getLinePattern();
+
+                // Find the current pattern and move to the next pattern in the wheel
+                for (int i = 0; i < LinePatterns.length; i++) {
+                        if (currentPattern == null || currentPattern[0] == LinePatterns[i]) {
+                                i += LinePatterns.length + amount;
+                                i %= LinePatterns.length;
+
+                                // if we are at the start of the wheel make it 'null' (solid
+                                // line)
+                                if (i == 0) {
+                                        setLinePattern(null);
+                                } else {
+                                        setLinePattern(new int[] { LinePatterns[i], LinePatterns[i] });
+                                }
+                                return;
+                        }
+                }
+        }
+
+        Collection<XRayable> _enclosures = new HashSet<XRayable>();
+
+        private boolean _deleted = false;
+
+        /**
+         * For now there can only be one enclosure per item
+         * @param enclosure
+         */
+        public void addEnclosure(XRayable enclosure) {
+                _enclosures.clear();
+                _enclosures.add(enclosure);
+        }
+
+        public Collection<? extends XRayable> getEnclosures() {
+                return _enclosures;
+        }
+
+        public void removeEnclosure(Item i) {
+                _enclosures.remove(i);
+
+        }
+
+        public boolean isDeleted() {
+                return _deleted;
         }
 }