Changeset 1102 for trunk/src/org/expeditee/io/flowlayout/DimensionExtent.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

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

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

@@ -19 +19 @@
 package org.expeditee.io.flowlayout;
 
-import java.awt.Polygon;
-import java.awt.Rectangle;
-import java.awt.geom.Area;
 import java.util.List;
 
+import org.expeditee.core.bounds.AxisAlignedBoxBounds;
+import org.expeditee.core.bounds.PolygonBounds;
 import org.expeditee.items.Item;
 
@@ -44 +43 @@
                 
                 for (Item item : items) {
-                        Area area = item.getArea();
-                        Rectangle rect = area.getBounds();
-                        int xl = rect.x;
-                        int xr = xl + rect.width-1;
+                        AxisAlignedBoxBounds bounds = item.getBoundingBox();
+                        int xl = bounds.getMinX();
+                        int xr = xl + bounds.getWidth()-1;
                         
                         min_x = Math.min(min_x, xl);
@@ -66 +64 @@
                 
                 for (Item item : items) {
-                        Area area = item.getArea();
-                        Rectangle rect = area.getBounds();
-                        int yt = rect.y;
-                        int yb = yt + rect.height-1;
+                        AxisAlignedBoxBounds bounds = item.getBoundingBox();
+                        int yt = bounds.getMinY();
+                        int yb = yt + bounds.getHeight()-1;
                         
                         min_y = Math.min(min_y, yt);
@@ -82 +79 @@
 
         
-        public static DimensionExtent calcMinMaxXExtent(Polygon polygon)
+        public static DimensionExtent calcMinMaxXExtent(PolygonBounds polygon)
         {
 
-                int min_x = Integer.MAX_VALUE;
-                int max_x = Integer.MIN_VALUE;
-                
-                int npoints = polygon.npoints;
-
-                for (int i=0; i<npoints; i++) {
-
-                        int x = polygon.xpoints[i];
-
-                        min_x = Math.min(min_x, x);
-                        max_x = Math.max(max_x, x);
-                }
-                
-                DimensionExtent extent = new DimensionExtent(min_x,max_x);
+                DimensionExtent extent = new DimensionExtent(polygon.getMinX(), polygon.getMaxX());
                 
                 return extent;
         }
         
-        public static DimensionExtent calcMinMaxYExtent(Polygon polygon)
+        public static DimensionExtent calcMinMaxYExtent(PolygonBounds polygon)
         {
 
-                int min_y = Integer.MAX_VALUE;
-                int max_y = Integer.MIN_VALUE;
-                
-                int npoints = polygon.npoints;
-                
-                for (int i=0; i<npoints; i++) {
-
-                        int y = polygon.ypoints[i];
-                                
-                        min_y = Math.min(min_y, y);
-                        max_y = Math.max(max_y, y);
-                }
-                
-                DimensionExtent extent = new DimensionExtent(min_y,max_y);
+                DimensionExtent extent = new DimensionExtent(polygon.getMinY(), polygon.getMaxY());
                 
                 return extent;
         }
         
-        public static Polygon boundingBoxPolygon(List<Item> items)
+        public static PolygonBounds boundingBoxPolygon(List<Item> items)
         {
-                DimensionExtent xextent = DimensionExtent.calcMinMaxXExtent(items);
-                DimensionExtent yextent = DimensionExtent.calcMinMaxYExtent(items);
-        
-                int xl=xextent.min;
-                int xr=xextent.max;
-                int yt=yextent.min;
-                int yb=yextent.max;
+                AxisAlignedBoxBounds box = null;
                 
-                int[] xpoints = new int[]{xl,xr,xr,xl};
-                int[] ypoints = new int[]{yt,yt,yb,yb};
+                for (Item i : items) {
+                        if (box == null) {
+                                box = i.getBoundingBox();
+                        } else {
+                                box.combineWith(i.getBoundingBox());
+                        }
+                }
                 
-                
-                Polygon polygon = new Polygon(xpoints,ypoints,4);
-                
-                return polygon;
+                return new PolygonBounds(box.getBorderLines());
         }
 }