Changeset 910 for trunk/src/org/expeditee/io

Timestamp:

04/23/14 11:10:21 (10 years ago)

Author:

davidb

Message:

Overspill cases, when text pokes outside of a rect, now handled more simply by cropping top and bottom at the start of the mapInItem()

File:

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

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

@@ -23 +23 @@
 {
         enum FlowType { in_flow, out_of_flow_original, out_of_flow_faked_position };
-
+        
         class MultiArrowHeadComparable implements Comparator<Item>{
                  
@@ -111 +111 @@
                         
                         XRawItem x_raw_item = new XRawItem(text_item);
+                        // overspill can occur (and is acceptable) when raw-text item spills out of enclosing shape (such as a rectangle)
                         mapInItem(x_raw_item);
                 }
@@ -222 +223 @@
                 
                 if ((y_index<0) || (y_index>=yitems_span_array.length)) {
-                    int y_top = getBoundingYTop();
-                    int y_bot = y_top + yitems_span_array.length -1;
-                    System.err.println("Error in getYOverlappingItemsSpan(): index out of bounds for value " + y);
-                    System.err.println("  => Operation mapped into local array: y-top=" + y_top + ", y-bot=" + y_bot);
+                        int y_top = getBoundingYTop();
+                        int y_bot = y_top + yitems_span_array.length -1;
+
+                        System.err.println("Error in getYOverlappingItemsSpan(): index out of bounds for value " + y);
+                        System.err.println("  => Operation mapped into local array: y-top=" + y_top + ", y-bot=" + y_bot);
+                 
                     return null;
                 }
@@ -231 +234 @@
         }
         
+        protected int cropToTop(int y) {
+                int y_index = y - getBoundingYTop();
+                
+                if (y_index<0) {
+                        y = getBoundingYTop();
+                }
+                
+                return y;
+        }
+        
+        protected int cropToBot(int y) {
+                int y_index = y - getBoundingYTop();
+        
+                if (y_index>=yitems_span_array.length) {
+                        y = getBoundingYBot();
+                }
+                
+                return y;
+        }
+        
         public void setYOverlappingItemsSpan(int y,YOverlappingItemsSpan yitems_span) 
         {
@@ -236 +259 @@
 
                 if ((y_index<0) || (y_index>=yitems_span_array.length)) {
-                    int y_top = getBoundingYTop();
-                    int y_bot = y_top + yitems_span_array.length -1;
-                    System.err.println("Error in setYOverlappingItemsSpan(): index out of bounds for value " + y);
-                    System.err.println("  => Operation mapped into local array: y-top=" + y_top + ", y-bot=" + y_bot);
+        
+                        int y_top = getBoundingYTop();
+                        int y_bot = y_top + yitems_span_array.length -1;
+
+                        System.err.println("Error in setYOverlappingItemsSpan(): index out of bounds for value " + y);
+                        System.err.println("  => Operation mapped into local array: y-top=" + y_top + ", y-bot=" + y_bot);
+
                     return;
                 }
@@ -577 +603 @@
                                                                 Point pt_to_check = new Point(item_to_check.getX(),item_to_check.getY());
                                                                 
-                                                                if (area_enclosed_polygon.isPerimieterPoint(pt_to_check)) {
+                                                                if (area_enclosed_polygon.isPerimeterPoint(pt_to_check)) {
                                                                         items_on_perimeter.add(item_to_check);
                                                                 }
@@ -652 +678 @@
                                 
                                 // Filter out enclosed-items points that are part of the polygon's perimeter
-                                if (area_polygon.isPerimieterPoint(enclosed_item.getPosition())) {
+                                if (area_polygon.isPerimeterPoint(enclosed_item.getPosition())) {
                                         enclosed_item_list.remove(i);
                                 }
@@ -678 +704 @@
                 
                 for (int y=yt; y<=yb; y++) {
-                        setYOverlappingItemsSpan(y,y_span_shadow);
+
+                        setYOverlappingItemsSpan(y,y_span_shadow); 
                 }
         }
@@ -700 +727 @@
                                 // Our shadow has run into another top-edged zone 
                                 //   => need to extend the shadow to include this zone as well
-                                //      (making this encountered top-edge obsolete
+                                //      (making this encountered top-edge obsolete)
                                 
                                 // Merge the newly encountered top-line in with the current one
@@ -741 +768 @@
                 int yb = xitem.getBoundingYBot();
                                 
+                // top-edge over-spill can occur (and is acceptable) when (for example) the given xitem is a raw-text item 
+                // that doesn't neatly fit in an enclosed area (i,e., is poking out the top of an enclosing rectangle)  
+                yt = cropToTop(yt); // Only changes yt if in an over-spill situation
+        
+                // similarly, bottom-edge over-spill can occur (and is acceptable) with a less than precise placed raw-text item 
+                yb = cropToBot(yb); // Only changes yb if in an over-spill situation
+                        
                 // Merge into 'items_span' checking for overlaps (based on xitem's y-span) 
                                 
@@ -794 +828 @@
 
                                         // Effectively after the shadow reference lookup this is the same
-                                        // as the above, with the need to worry about Step 2 (as no move is needed)
+                                        // as the above, without the need to worry about Step 2 (as no move is needed)
 
                                         YOverlappingItemsShadow y_item_span_shadow = (YOverlappingItemsShadow)item_span;
@@ -827 +861 @@
                         
                         YOverlappingItemsTopEdge y_item_span_top_edge = new YOverlappingItemsTopEdge(xitem_line);
+                
                         setYOverlappingItemsSpan(yt,y_item_span_top_edge);
 
                         castShadowIntoEmptySpace(y_item_span_top_edge, yt+1, yb);
-
                 }