Changeset 960

Timestamp:

09/01/15 11:06:36 (9 years ago)

Author:

bln4

Message:

 

Location:

trunk/src/org/expeditee/items/MagneticConstraint

Files:

• Actions/RepelTextAction.java (modified) (1 diff)
• Utilities/BoxLogic.java (modified) (3 diffs)
• Utilities/Line.java (modified) (1 diff)
• Utilities/Paragraph.java (modified) (2 diffs)

trunk/src/org/expeditee/items/MagneticConstraint/Actions/RepelTextAction.java

@@ -27 +27 @@
                         if(BoxLogic.boxCollision(item)) {
                                 callback(null);
-                                BoxLogic.resolveCollision(item, this);
-                                callback(null);
-                                MagneticConstraints.Log(this.getClass(), new Item[]{item}, 
-                                                Line.getLineContainingToken(item).toArray(new Item[]{}), 
-                                                "No item found to right to repel.  Collision occured.");
+//                              BoxLogic.resolveCollision(item, this);
+//                              callback(null);
+//                              MagneticConstraints.Log(this.getClass(), new Item[]{item}, 
+//                                              Line.getLineContainingToken(item).toArray(new Item[]{}), 
+//                                              "No item found to right to repel.  Collision occured.");
                         } else {
                                 MagneticConstraints.Log(this.getClass(), new Item[]{item}, 

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

@@ -37 +37 @@
         
         public static boolean boxCollision(final Item item) {
+                if(item.getParent() == null) return false;
                 final List<org.expeditee.items.Line> verticalLines = BoxLogic
                                 .getVerticalLines(item.getParent());
@@ -44 +45 @@
                         final int bottomPos = Math.max(canditate.getStartItem().getY(),
                                         canditate.getEndItem().getY());
-                        if (topPos < item.getY() && bottomPos > item.getY()) {
-                                if (item.getX() + item.getBoundsWidth() > canditate
+                        final Rectangle itemHitBox = item.getArea().getBounds();
+                        if (topPos < itemHitBox.getY() && bottomPos > itemHitBox.getY()) {
+                                if (itemHitBox.getX() + itemHitBox.getWidth() > canditate
                                                 .getStartItem().getX()
-                                                && item.getX() < canditate.getStartItem().getX()) {
+                                                && itemHitBox.getX() < canditate.getStartItem().getX()) {
                                         return true;
                                 }
@@ -54 +56 @@
                 return false;
         }
+        
+//      private static boolean lineShadowsItem(final org.expeditee.items.Line line, final Item item) {
+//              final int topPos = Math.min(line.getStartItem().getY(),
+//                              line.getEndItem().getY());
+//              final int bottomPos = Math.max(line.getStartItem().getY(),
+//                              line.getEndItem().getY());
+//              final Rectangle itemHitBox = item.getArea().getBounds();
+//              return topPos < itemHitBox.
+//      }
 
         public static void resolveCollision(final Item item, final MagneticConstraintAction remagnet) {

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

@@ -57 +57 @@
         
         public Rectangle getBoundingBox() {
-                final Rectangle rect = new Rectangle(this.getFirst().getX(), this.getFirst().getY(), this.getFirst().getBoundsWidth(), this.getFirst().getBoundsHeight());
-                for(final Item token : this) 
-                        rect.add(new Rectangle(token.getX(), token.getY(), token.getBoundsWidth(), token.getBoundsHeight()));
+//              final Rectangle rect = new Rectangle(this.getFirst().getX(), this.getFirst().getY(), this.getFirst().getBoundsWidth(), this.getFirst().getBoundsHeight());
+//              for(final Item token : this) 
+//                      rect.add(new Rectangle(token.getX(), token.getY(), token.getBoundsWidth(), token.getBoundsHeight()));
+//              return rect;
+                final Rectangle rect = this.getFirst().getArea().getBounds();
+                for(final Item token : this)
+                        rect.add(token.getArea().getBounds());
                 return rect;
         }

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

@@ -58 +58 @@
                         //4b. No; then we simply need to calculate the position of the next line and return that.
                         final Rectangle boundingBox = splitAt.getBoundingBox();
-                        return new Point((int)boundingBox.getX(), (int)boundingBox.getMinY() + lineHeight);
+                        return new Point((int)boundingBox.getX(), (int)boundingBox.getMaxY() + lineHeight);
                 } 
                 //NB at this point we know that there are lines below our 'splitAt' line in the same paragraph so they need to be moved down.
@@ -69 +69 @@
         
         private static int getLineHeight(final Line line) {
-                return (int) (line.get(0).getBoundsHeight() * 1.2);
+                return (int) (line.get(0).getArea().getBounds().getHeight() * 1.2);
         }