Changeset 970

Timestamp:

10/27/15 12:11:12 (9 years ago)

Author:

bln4

Message:

Ok, now when following a daisy chain it properly looks for loops. If it sees a loop it won't walk into it twice.

Location:

trunk/src/org/expeditee

Files:

• io/flowlayout/XGroupItem.java (modified) (6 diffs)
• items/MagneticConstraint/Actions/RepelTextAction.java (modified) (2 diffs)

trunk/src/org/expeditee/io/flowlayout/XGroupItem.java

@@ -410 +410 @@
                 }
         }
-
+        
+        protected boolean daisyChainContainsLoop(final XGroupItem toplevel_xgroup, final Item exitingDot, Collection<XGroupItem> groupsSeen) {
+                final Item start_item = exitingDot;
+                final Item end_item = start_item.getLines().get(0).getEndItem();
+                final XGroupItem xgroup = innermostXGroup(end_item,toplevel_xgroup.getGroupedItemList());
+                
+                if(groupsSeen.contains(xgroup)) return true;
+                
+                groupsSeen.add(xgroup);
+                
+                for(final Item i : xgroup.remaining_item_list) {
+                        final List<Line> lines = i.getLines();
+                        if(lines.size() == 1 && lines.get(0).getStartItem() == i) {
+                                return daisyChainContainsLoop(toplevel_xgroup, i, groupsSeen);
+                        }
+                }
+                
+                return false;                   
+        }
         
         protected void repositionOutOfFlowGroupsFollowLine(XGroupItem toplevel_xgroup, Item remaining_item, Collection<XGroupItem> out_of_flow)
@@ -419 +437 @@
                 //   See if the arrow-head falls inside an XGroup area
                 //   => Ignore endings that are in the same XGroupItem as the line started in
-                
                 List<Line> used_in_lines = remaining_item.getLines();
                 if (used_in_lines.size()==1) {
@@ -452 +469 @@
                                                 
                                                 if (xgroup_item != this) {
-                                                        
-                                                        if(out_of_flow.contains(xgroup_item)) {
-                                                                final Collection<Item> remaining_dots = new ArrayList<Item>(xgroup_item.remaining_item_list);
-                                                                boolean hasExit = false;
-                                                                for(final Item i : remaining_dots) {
-                                                                        final List<Line> lines = i.getLines();
-                                                                        if(lines.size() == 1 && lines.get(0).getStartItem() == i) {
-                                                                                hasExit = true;
-                                                                                break;
-                                                                        }
+                                                
+                                                        if(out_of_flow.contains(xgroup_item) && daisyChainContainsLoop(toplevel_xgroup, start_item, new ArrayList<XGroupItem>())) {
+                                                                System.err.println("#Found infinite loop; not following.");
+                                                                continue;
+                                                        }
+                                                        
+
+                                                        
+                                                        if(!out_of_flow.contains(xgroup_item)) {
+                                                                for (Item remaining_item_deeper: xgroup_item.getRemainingItemList()) {
+                                                                        xgroup_item.repositionOutOfFlowGroupsFollowLine(toplevel_xgroup,remaining_item_deeper,out_of_flow);
                                                                 }
-                                                                if(hasExit) continue;
                                                         }
-                                                        
-                                                        out_of_flow.add(xgroup_item);
-                                                        
-                                                        for (Item remaining_item_deeper: xgroup_item.getRemainingItemList()) {
-                                                                xgroup_item.repositionOutOfFlowGroupsFollowLine(toplevel_xgroup,remaining_item_deeper,out_of_flow);
-                                                        }
-                                                                                                                
+
+                                                        out_of_flow.add(xgroup_item);                                                   
                                                         
                                                         
@@ -535 +547 @@
                 repositionOutOfFlowGroupsRecursive(toplevel_xgroup,out_of_flow); 
                 
-                List<XGroupItem >toplevel_grouped_item_list = toplevel_xgroup.getGroupedItemList();
+//              List<XGroupItem >toplevel_grouped_item_list = toplevel_xgroup.getGroupedItemList();
 
                 // ****
@@ -622 +634 @@
                          List<Text> raw_text_item_list, List<XGroupItem> grouped_item_list, List<Item> remaining_item_list)
         {
+                final List<Item> origonal_item_list = new ArrayList<Item>(item_list);
                 // raw_text_items_list => all the non-enclosed text items
                 // grouped_items_list  => list of all enclosures containing text items 
@@ -760 +773 @@
                                 if (area_polygon.isPerimeterPoint(enclosed_item.getPosition())) {
                                         enclosed_item_list.remove(i);
-                                }
+                                        //Don't include items the user hasn't asked us to.
+                                } 
+                                //Only include items the user has asked to to include.
+                                else if(!origonal_item_list.contains(enclosed_item)) enclosed_item_list.remove(i);
                                 else {
                                         i++;

trunk/src/org/expeditee/items/MagneticConstraint/Actions/RepelTextAction.java

@@ -3 +3 @@
 import java.awt.Point;
 
+import org.expeditee.gui.Browser;
 import org.expeditee.gui.FrameUtils;
 import org.expeditee.items.Item;
+import org.expeditee.items.Text;
 import org.expeditee.items.MagneticConstraint.MagneticConstraintActionWithArguments;
 import org.expeditee.items.MagneticConstraint.MagneticConstraints;
@@ -42 +44 @@
                         return false;
                 } else {
+                        final int charDistance = Browser._theBrowser.getFontMetrics(((Text)item).getFont()).stringWidth("X");
                         final Line tokensToMove = Line.getLineFromToken(item);
-                        System.err.println("#Repeling tokens: " + tokensToMove);
                         tokensToMove.removeFirst();
+                        boolean afterGap = false;
+                        for(int i = 1; i < tokensToMove.size();) {
+                                if(afterGap) tokensToMove.remove(i);
+                                else if((tokensToMove.get(i).getX() - charDistance) > (tokensToMove.get(i - 1).getX() + tokensToMove.get(i - 1).getBoundsWidth())) {
+                                        afterGap = true;
+                                        tokensToMove.remove(i);
+                                } else i++;
+                        }
                         tokensToMove.deltaX(args[0].intValue());
                         for(final Item token : tokensToMove) {