Changeset 936

Timestamp:

11/15/14 18:00:04 (10 years ago)

Author:

bln4

Message:

Modifications to XGroupItem for SpIDER

File:

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

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

@@ -40 +40 @@
 public class XGroupItem extends XItem 
 {
+        public static final Text GROUPSEP_END = new Text('2' + ""); //ASCII '2' is start of text
+
+        public static final Text GROUPSEP_START = new Text('3' + ""); //ASCII '3' is end of text
+        
         enum FlowType { in_flow, out_of_flow_original, out_of_flow_faked_position };
         
@@ -130 +134 @@
                 for (Text text_item : raw_text_item_list) {
                         
-                        XRawItem x_raw_item = new XRawItem(text_item);
+                        XRawItem x_raw_item = new XRawItem(text_item, this);
                         // overspill can occur (and is acceptable) when raw-text item spills out of enclosing shape (such as a rectangle)
                         mapInItem(x_raw_item);
@@ -1238 +1242 @@
         }
         
-        
-
-        public ArrayList<Item> getYXOverlappingItemList(boolean separateGroups)
-        {
-                ArrayList<Item> overlapping_y_ordered_items = new ArrayList<Item>();
-                
-                for (int y=0; y<y_span_height; y++) {
-                        
+        public List<Item[]> getYXOverlappingItemListLines() {
+                final List<XRawItem> yxOverlappingXRawItemList = getYXOverlappingXRawItemList(true);
+                final List<Item[]> lines = new ArrayList<Item[]>();
+                final List<XRawItem> currentLineXItem = new ArrayList<XRawItem>();
+                for(final XRawItem xitem : yxOverlappingXRawItemList) {
+                        if(xitem.getItem() == GROUPSEP_START) continue;
+                        else if(xitem.getItem() == GROUPSEP_END) {
+                                if(currentLineXItem.isEmpty()) continue;
+                                else {
+                                        final List<Item> ln = new ArrayList<Item>();
+                                        for(final XRawItem xrawitem : currentLineXItem) ln.add(xrawitem.getItem());
+                                        lines.add(ln.toArray(new Item[]{}));
+                                        currentLineXItem.clear();
+                                }
+                        } else {
+                                if(currentLineXItem.isEmpty()) currentLineXItem.add(xitem);
+                                else {
+                                        final YOverlappingItemsSpan[] itemSpanArray = xitem.getGroup().yitems_span_array;
+                                        final int index = xitem.getBoundingYTop() - xitem.getGroup().getBoundingYTop();
+                                        final YOverlappingItemsSpan itemSpan = itemSpanArray[index];
+                                        final List<XItem> xOrderedList = itemSpan instanceof YOverlappingItemsTopEdge ? 
+                                                        ((YOverlappingItemsTopEdge)itemSpan).getXOrderedLine().getXItemList() : 
+                                                                ((YOverlappingItemsShadow)itemSpan).getTopEdge().getXOrderedLine().getXItemList();
+                                        if(!xOrderedList.contains(currentLineXItem.get(0))) {
+                                                if(!currentLineXItem.isEmpty()) {
+                                                        final List<Item> ln = new ArrayList<Item>();
+                                                        for(final XRawItem xrawitem : currentLineXItem) ln.add(xrawitem.getItem());
+                                                        lines.add(ln.toArray(new Item[]{}));
+                                                        currentLineXItem.clear();
+                                                }
+                                                currentLineXItem.add(xitem);
+                                        } else {
+                                                currentLineXItem.add(xitem);
+                                        }
+                                }
+                        }
+                }
+                if(!currentLineXItem.isEmpty()) {
+                        final List<Item> ln = new ArrayList<Item>();
+                        for(final XRawItem xrawitem : currentLineXItem) ln.add(xrawitem.getItem());
+                        lines.add(ln.toArray(new Item[]{}));
+                        currentLineXItem.clear();
+                }
+                return lines;
+        }
+
+        public ArrayList<Item> getYXOverlappingItemList(boolean separateGroups) {
+                final List<XRawItem> yxOverlappingXItemList = getYXOverlappingXRawItemList(separateGroups);
+                final ArrayList<Item> yxOverlappingItemList = new ArrayList<Item>();
+                for(final XRawItem xitem : yxOverlappingXItemList) yxOverlappingItemList.add(xitem.getItem());
+                return yxOverlappingItemList;
+        }
+        
+        public List<XRawItem> getYXOverlappingXRawItemList(final boolean separateGroups) {
+                ArrayList<XRawItem> overlapping_y_ordered_items = new ArrayList<XRawItem>();
+
+                for (int y = 0; y < y_span_height; y++) {
+
                         YOverlappingItemsSpan item_span = yitems_span_array[y];
-                        
+
                         if (item_span != null) {
 
                                 if (item_span instanceof YOverlappingItemsTopEdge) {
-                                        
-                                        YOverlappingItemsTopEdge item_span_top_edge = (YOverlappingItemsTopEdge)item_span;
-                                        XOrderedLine xitem_line = item_span_top_edge.getXOrderedLine();
+
+                                        YOverlappingItemsTopEdge item_span_top_edge = (YOverlappingItemsTopEdge) item_span;
+                                        XOrderedLine xitem_line = item_span_top_edge
+                                                        .getXOrderedLine();
 
                                         for (XItem xspan : xitem_line.getXItemList()) {
                                                 if (xspan instanceof XRawItem) {
-                                                        XRawItem xitem_span = (XRawItem)xspan;
-                                                        Item item = xitem_span.getItem();
-                                                        
-                                                        overlapping_y_ordered_items.add(item);
-                                                }
-                                                else {
-                                                        // Must be an XGroupItem => recursive call on xspan item
-                                                        
-                                                        XGroupItem nested_group_item = (XGroupItem)xspan;
-                                                        ArrayList<Item> nested_overlapping_items = nested_group_item.getYXOverlappingItemList(separateGroups);
-                                                        if(separateGroups) {
-                                                                overlapping_y_ordered_items.add(new Text("{"));
+                                                        XRawItem xitem_span = (XRawItem) xspan;
+//                                                      Item item = xitem_span.getItem();
+//
+//                                                      overlapping_y_ordered_items.add(item);
+                                                        overlapping_y_ordered_items.add(xitem_span);
+                                                } else {
+                                                        // Must be an XGroupItem => recursive call on xspan
+                                                        // item
+
+                                                        XGroupItem nested_group_item = (XGroupItem) xspan;
+                                                        List<XRawItem> nested_overlapping_items = nested_group_item
+                                                                        .getYXOverlappingXRawItemList(separateGroups);
+                                                        if (separateGroups) {
+                                                                overlapping_y_ordered_items.add(new XRawItem(GROUPSEP_START, this));
                                                         }
-                                                        overlapping_y_ordered_items.addAll(nested_overlapping_items);
-                                                        if(separateGroups) {
-                                                                overlapping_y_ordered_items.add(new Text("}"));
+                                                        overlapping_y_ordered_items
+                                                                        .addAll(nested_overlapping_items);
+                                                        if (separateGroups) {
+                                                                overlapping_y_ordered_items.add(new XRawItem(GROUPSEP_END, this));
                                                         }
                                                 }
@@ -1279 +1337 @@
                         }
                 }
-                
+
                 return overlapping_y_ordered_items;
         }