Changeset 1102 for trunk/src/org/expeditee/items/MagneticConstraint/Utilities/Paragraph.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/items/MagneticConstraint/Utilities/Paragraph.java (modified) (7 diffs)

trunk/src/org/expeditee/items/MagneticConstraint/Utilities/Paragraph.java

@@ -1 +1 @@
 package org.expeditee.items.MagneticConstraint.Utilities;
 
-import java.awt.*;
 import java.util.LinkedList;
+
+import org.expeditee.core.Point;
+import org.expeditee.core.bounds.AxisAlignedBoxBounds;
 import org.expeditee.items.Text;
 
@@ -30 +32 @@
         }
         
-        public Rectangle getBoundingBox() {
-                final Rectangle rect = new Rectangle();
-                for(final Line ln : this) rect.add(ln.getBoundingBox());
+        public AxisAlignedBoxBounds getBoundingBox() {
+                AxisAlignedBoxBounds rect = null;
+                for(final Line ln : this) {
+                        if (rect == null) rect = ln.getBoundingBox();
+                        else rect.combineWith(ln.getBoundingBox());
+                }
                 return rect;
         }
@@ -50 +55 @@
                 if(nextLine == null) {
                         //2a. No; then we simply need to calculate the position of where it would be and return that.
-                        final Rectangle boundingBox = splitAt.getBoundingBox();
-                        return new Point((int)boundingBox.getX(), (int)boundingBox.getMaxY() + lineHeight);
+                        final AxisAlignedBoxBounds boundingBox = splitAt.getBoundingBox();
+                        return new Point((int)boundingBox.getMinX(), (int)boundingBox.getMaxY() + lineHeight);
                 }
                 //3. Get paragraph starting from the next line
@@ -58 +63 @@
                 if(!this.containsAll(paragraphStartingAtNextLine)) {
                         //4b. No; then we simply need to calculate the position of the next line and return that.
-                        final Rectangle boundingBox = splitAt.getBoundingBox();
+                        final AxisAlignedBoxBounds boundingBox = splitAt.getBoundingBox();
                         return new Point(((Text) splitAt.getFirst()).getX(), (int)boundingBox.getMaxY() + lineHeight);
                 } 
@@ -66 +71 @@
                 //6. Return the position of the new line we have made space for.
                 
-                final Rectangle boundingBox = splitAt.getBoundingBox();
+                final AxisAlignedBoxBounds boundingBox = splitAt.getBoundingBox();
                 final int x = ((Text) splitAt.getFirst()).getX();
                 return new Point(x, (int)boundingBox.getMaxY() + lineHeight);
@@ -72 +77 @@
         
         private static int getLineHeight(final Line line) {
-                return (int) (line.get(0).getArea().getBounds().getHeight() * 1.2);
+                return (int) (line.get(0).getBoundingBox().getHeight() * 1.2);
         }
         
@@ -89 +94 @@
         private static boolean isInSameParagraph(final Line thisLine, final Line nextLine, final int lineHeight) {
                 if(!XGroupLogic.areInSameXGroup(thisLine.get(0), nextLine.get(0))) return false;
-                final Rectangle thisLineBoundingBox = thisLine.getBoundingBox();
-                final Rectangle nextLineBoundingBox = nextLine.getBoundingBox();
-                final Point toAdd = new Point(Math.min((int)thisLineBoundingBox.getX(),(int) nextLineBoundingBox.getX()), (int)thisLineBoundingBox.getMaxY() + lineHeight);
-                final Rectangle overlappingSection = new Rectangle(thisLineBoundingBox);
-                overlappingSection.add(toAdd);
+                final AxisAlignedBoxBounds thisLineBoundingBox = thisLine.getBoundingBox();
+                final AxisAlignedBoxBounds nextLineBoundingBox = nextLine.getBoundingBox();
+                final Point toAdd = new Point(Math.min((int)thisLineBoundingBox.getMinX(),(int) nextLineBoundingBox.getMinX()), (int)thisLineBoundingBox.getMaxY() + lineHeight);
+                final AxisAlignedBoxBounds overlappingSection = new AxisAlignedBoxBounds(thisLineBoundingBox);
+                overlappingSection.combineWith(toAdd);
                 return overlappingSection.intersects(nextLineBoundingBox);
         }