Changeset 907

Timestamp:

04/22/14 11:25:40 (10 years ago)

Author:

davidb

Message:

Y-by-X Walker algorithm failed to follow nested boxes when an out-of-flow arrow used. This code change (with some additional trial code deliberately left in, but commented out) addresses this issue.

File:

• trunk/src/org/expeditee/io/flowlayout/XGroupItem.java (modified) (6 diffs)

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

@@ -404 +404 @@
         /**     
           *     Look for any 'out-of-flow' XGroup boxes, signalled by the user drawing an arrow line to it
-          *      => force an artificial change to such boxes so its dimensions become point becomes the starting point
+          *      => force an artificial change to such boxes so its dimensions becomes the starting point
           *         of the arrow line.  This will make it sort to the desired spot in the YOverlapping span
           */
@@ -802 +802 @@
 
                                         // merge with this item list, preserving x ordering
-
                                         xitem_span.orderedMergeItem(xitem.getBoundingXLeft(),xitem);
 
@@ -816 +815 @@
                 }
 
+                // Having checked all the y-location's ('yt' to 'yb') of this x-item, if all y-span entries were found to be null
+                // => 'merged_item' is still false
+                
                 if (!merged_item) {
                         // xitem didn't intersect with any existing y-spans 
@@ -834 +836 @@
         }
         
-        public void mapInXGroupItemsRecursive(List<XGroupItem> xgroup_item_list)
+        public void mapInXGroupItemsRecursive(List<XGroupItem> xgroup_item_list/*,boolean globally_faked_out_of_flow*/)
         {
                 
@@ -847 +849 @@
                 for (XGroupItem xgroup_item: xgroup_item_list) {
 
-                        if (!xgroup_item.isOriginalOutOfFlowItem()) {
+                        //boolean xgroup_item_faked_out_of_flow = xgroup_item.isFakedOutOfFlowItem();
+                        /*
+                        if (globally_faked_out_of_flow || xgroup_item_faked_out_of_flow) {
+                                // Process any children to a faked out-of-flow items
+                                List<XGroupItem> nested_xgroup_item_list = xgroup_item.getGroupedItemList();
+
+                                if (nested_xgroup_item_list.size() >0) {
+                                        xgroup_item.mapInXGroupItemsRecursive(nested_xgroup_item_list,true);
+                                }
+                        }
+                        else*/ 
+                        //if (!xgroup_item.isOriginalOutOfFlowItem()) {
+                                
                                 List<XGroupItem> nested_xgroup_item_list = xgroup_item.getGroupedItemList();
 
@@ -853 +867 @@
                                         xgroup_item.mapInXGroupItemsRecursive(nested_xgroup_item_list);
                                 }
-                        }
+                        //}
                 }       
         }