Changeset 50 for trunk/src/org/expeditee/items/Line.java

Timestamp:

05/16/08 10:25:28 (16 years ago)

Author:

ra33

Message:

A whole day of big changes.
Adding the ability to have Text at the end of Lines.
Also a lot of refactoring to improve the quality of code relating to constraints and lines

File:

• trunk/src/org/expeditee/items/Line.java (modified) (18 diffs)

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

@@ -81 +81 @@
 
                 // initialise the line size
-                float thick;
-
-                if (_start instanceof Dot && _end instanceof Dot)
-                        thick = (((Dot) _start).getThickness() + ((Dot) _end)
-                                        .getThickness()) / 2.0f;
-                else if (_start instanceof Dot)
-                        thick = ((Dot) _start).getThickness();
-                else if (_end instanceof Dot)
-                        thick = ((Dot) _end).getThickness();
-                else
+                float thick = (_start.getThickness() + _end.getThickness()) / 2.0f;
+
+                if (thick < 0)
                         thick = 1;
+                /*
+                 * if (_start instanceof Dot && _end instanceof Dot) thick = (((Dot)
+                 * _start).getThickness() + ((Dot) _end) .getThickness()) / 2.0f; else
+                 * if (_start instanceof Dot) thick = ((Dot) _start).getThickness();
+                 * else if (_end instanceof Dot) thick = ((Dot) _end).getThickness();
+                 * else thick = 1;
+                 */
 
                 setThickness(thick);
@@ -134 +134 @@
 
         /**
-         * Replaces either the start or end point of this Line with the given Dot.
-         * This is used when merging two Dots.
+         * Replaces either the start or end point of this Line with the given
+         * LineEnd. This is used when merging LineEnds. It will also add and remove
+         * the line from the LineEnds as well as adjust constraints.
          * 
          * @param replace
@@ -144 +145 @@
          */
         public void replaceEnd(Item replace, Item with) {
-                if (_start == replace)
+                Item otherEnd = null;
+                if (_start == replace) {
                         setStartItem(with);
-                else
+                        otherEnd = _end;
+                } else if (_end == replace) {
                         setEndItem(with);
+                        otherEnd = _start;
+                }
+                // if no end was replaced
+                if (otherEnd == null)
+                        return;
+                // Copy the constraints list so the endPoints list can be modified
+                List<Constraint> constraints = new ArrayList<Constraint>(replace
+                                .getConstraints());
+                // Now change all the constraints for this line only
+                for (int i = 0; i < constraints.size(); i++) {
+                        Constraint c = constraints.get(i);
+                        if (c.contains(otherEnd)) {
+                                c.replaceEnd(replace, with);
+                        }
+                }
         }
 
@@ -154 +172 @@
                         _start.removeLine(this);
 
-                        if (!(start instanceof Dot)) {
-                                _startOffset.x = _start.getX() - start.getX();
-                                _startOffset.y = _start.getY() - start.getY();
-                        } else {
+                        /*
+                         * if (!(start instanceof Dot)) { _startOffset.x = _start.getX() -
+                         * start.getX(); _startOffset.y = _start.getY() - start.getY(); }
+                         * else
+                         */{
                                 _startOffset.x = 0;
                                 _startOffset.y = 0;
@@ -172 +191 @@
                         _end.removeLine(this);
 
-                        if (!(end instanceof Dot)) {
-                                _endOffset.x = _end.getX() - end.getX();
-                                _endOffset.y = _end.getY() - end.getY();
-                        } else {
+                        /*
+                         * if (!(end instanceof Dot)) { _endOffset.x = _end.getX() -
+                         * end.getX(); _endOffset.y = _end.getY() - end.getY(); } else
+                         */{
                                 _endOffset.x = 0;
                                 _endOffset.y = 0;
@@ -211 +230 @@
         }
 
+        @Override
         public void setX(int x) {
         }
 
+        @Override
         public void setY(int y) {
         }
@@ -287 +308 @@
                 g.setColor(getPaintColor());
 
-                //if (this._mode == Item.SelectedMode.Disconnect)
-                //      System.out.println("Disconnect mode!");
-                
+                // if (this._mode == Item.SelectedMode.Disconnect)
+                // System.out.println("Disconnect mode!");
+
                 if (_start instanceof Text && ((Text) _start).startsWith("@c")) {
                         g.setStroke(_lineStroke);
@@ -340 +361 @@
                         Point endOffset) {
                 // only draw an arrowhead if necessary
-                if (!(this._mode == Item.SelectedMode.Disconnect 
-                                && withArrow._mode == Item.SelectedMode.Disconnect)
-                                && (!withArrow.hasVisibleArrow()
-                                || withArrow.getLines().size() > 1))
+                if (!(this._mode == Item.SelectedMode.Disconnect && withArrow._mode == Item.SelectedMode.Disconnect)
+                                && (!withArrow.hasVisibleArrow() || withArrow.getLines().size() > 1))
                         return;
 
@@ -356 +375 @@
                 double arrowRatio = withArrow.getArrowheadRatio();
 
-                //set the size of the disconnect indicator arrowhead
-                if (this._mode == Item.SelectedMode.Disconnect){
-                        //System.out.println("Disconnect mode!");
+                // set the size of the disconnect indicator arrowhead
+                if (this._mode == Item.SelectedMode.Disconnect) {
+                        // System.out.println("Disconnect mode!");
                         arrowLength = 15;
                         arrowRatio = 0.3;
-                        //Make sure the arrowhead positions get recalculated
+                        // Make sure the arrowhead positions get recalculated
                         withArrow.setArrowhead(null);
                 }
-                
+
                 // if the arrowhead is 'auto', then one and only one end must be
                 // floating
@@ -489 +508 @@
                         return end;
                 } else if (distStart < DISCONNECT_THRESHHOLD) {
-                        start._mode = Item.SelectedMode.Disconnect;
+                        if (start.getLines().size() > 1
+                                        || start.getConstraints().size() > 0)
+                                start._mode = Item.SelectedMode.Disconnect;
+                        else
+                                start._mode = Item.SelectedMode.Normal;
                         return start;
                 } else if (distEnd < DISCONNECT_THRESHHOLD) {
-                        end._mode = Item.SelectedMode.Disconnect;
+                        if (end.getLines().size() > 1 || end.getConstraints().size() > 0)
+                                end._mode = Item.SelectedMode.Disconnect;
+                        else
+                                end._mode = Item.SelectedMode.Normal;
                         return end;
                 }
@@ -520 +546 @@
                 super.setColor(c);
 
-                if (_start.getColor() != c)
-                        _start.setColor(c);
-
-                if (_end.getColor() != c)
-                        _end.setColor(c);
-        }
-
-        @Override
-        public int getSize() {
-                return _start.getSize();
-        }
-
-        @Override
-        public void setSize(int size) {
+                _start.lineColorChanged(c);
+                _end.lineColorChanged(c);
         }
 
@@ -543 +557 @@
                         thick = DEFAULT_THICKNESS;
 
-                if (_start instanceof Dot) {
-                        Dot start = (Dot) _start;
-                        if (start.getThickness() != thick)
-                                start.setThickness(thick);
-                }
-
-                if (_end instanceof Dot) {
-                        Dot end = (Dot) _end;
-                        if (end.getThickness() != thick)
-                                end.setThickness(thick);
-                }
+                if (_start.getThickness() != thick)
+                        _start.setThickness(thick);
+
+                if (_end.getThickness() != thick)
+                        _end.setThickness(thick);
 
                 int[] pattern = _start.getLinePattern();
@@ -734 +742 @@
         private Dot _virtualSpot = null;
 
-        public void showVirtualSpot(Dot orig, int mouseX, int mouseY) {
+        public void showVirtualSpot(Item orig, int mouseX, int mouseY) {
                 if (orig.getLines().size() != 1)
                         return;
@@ -742 +750 @@
                         return;
 
-                Dot spot = orig.copy();
+                Dot spot = new Dot(-1, orig.getX(), orig.getY());
+                Item.DuplicateItem(orig, spot);
                 spot.setThickness(Math.max(this.getThickness(), 5));
                 if (this.getColor() != Color.RED)
@@ -817 +826 @@
         }
 
-        public Item forceMerge(Item merger, int mouseX, int mouseY) {
-                Dot spot = (Dot) merger;
-
-                if (spot.getConstraints() != null)
-                        spot.getConstraints().clear();
-
-                if (_end.getConstraints() != null)
-                        _end.getConstraints().clear();
-
-                if (_start.getConstraints() != null)
-                        _start.getConstraints().clear();
+        public Item forceMerge(Item spot, int mouseX, int mouseY) {
+
+                spot.removeAllConstraints();
+
+                _end.removeAllConstraints();
+
+                _start.removeAllConstraints();
 
                 // calculate nearest point on line from spot
@@ -840 +845 @@
                 // if the line is horizontal
                 if (slope1 == 0) {
-                        x = merger.getX();
+                        x = spot.getX();
                         y = _start.getY();
                         // if the line is vertical
                 } else if (slope2 == 0) {
                         x = _start.getX();
-                        y = merger.getY();
+                        y = spot.getY();
                         // otherwise, the line is sloped
                 } else {
@@ -875 +880 @@
         @Override
         public Item merge(Item merger, int mouseX, int mouseY) {
-                if (!(merger instanceof Dot))
+                if (!(merger.isLineEnd()))
                         return merger;
 
-                Dot spot = (Dot) merger;
+                Item spot = merger;
 
                 // dots with multiple lines cannot be attached, nor can dots with no
@@ -1015 +1020 @@
                         _end.delete();
         }
+
+        @Override
+        public void anchor() {
+                super.anchor();
+                fixArrowheadLength();
+        }
+
+        /**
+         * Removes constraints from the end points of this line.
+         */
+        @Override
+        public void removeAllConstraints() {
+                // Find all constraints that include both the start and end.
+                for (Constraint c : _start.getConstraints()) {
+                        if (c.contains(_end)) {
+                                _start.removeConstraint(c);
+                                _end.removeConstraint(c);
+                        }
+                }
+        }
 }