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

trunk/src/org/expeditee/items/Dot.java

@@ -19 +19 @@
 package org.expeditee.items;
 
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.Polygon;
-import java.awt.Rectangle;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.expeditee.gui.DisplayIO;
+import org.expeditee.core.Colour;
+import org.expeditee.core.Dimension;
+import org.expeditee.core.Fill;
+import org.expeditee.core.Point;
+import org.expeditee.core.bounds.AxisAlignedBoxBounds;
+import org.expeditee.core.bounds.Bounds;
+import org.expeditee.core.bounds.PolygonBounds;
+import org.expeditee.gio.EcosystemManager;
+import org.expeditee.gio.GraphicsManager;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameGraphics;
-import org.expeditee.gui.FrameKeyboardActions;
 
 /**
@@ -70 +74 @@
 
         @Override
-        public void setColor(Color c) {
+        public void setColor(Colour c) {
                 super.setColor(c);
 
@@ -79 +83 @@
 
         @Override
-        public void setAnchorLeft(Float anchor) {
+        public void setAnchorLeft(Integer anchor) {
                 if (!isLineEnd()) {
                         super.setAnchorLeft(anchor);
@@ -88 +92 @@
                 invalidateCommonTrait(ItemAppearence.PreMoved);
                 
-                this._anchorLeft = anchor;
-                this._anchorRight = null;
+                this._anchoring.setLeftAnchor(anchor);
                 
                 int oldX = getX();
@@ -102 +105 @@
 
         @Override
-        public void setAnchorRight(Float anchor) {
+        public void setAnchorRight(Integer anchor) {
                 if (!isLineEnd()) {
                         super.setAnchorRight(anchor);
@@ -110 +113 @@
                 invalidateCommonTrait(ItemAppearence.PreMoved);
                 
-                this._anchorRight = anchor;
-                this._anchorLeft = null;
+                this._anchoring.setRightAnchor(anchor);
                 
                 int oldX = getX();
                 if (anchor != null) {
-                        float deltaX = FrameGraphics.getMaxFrameSize().width - anchor
-                                        - getBoundsWidth() - oldX;
+                        float deltaX = DisplayController.getFramePaintArea().getWidth() - anchor - getBoundsWidth() - oldX;
 
                         anchorConnected(AnchorEdgeType.Right, deltaX);
@@ -126 +127 @@
 
         @Override
-        public void setAnchorTop(Float anchor) {
+        public void setAnchorTop(Integer anchor) {
                 if (!isLineEnd()) {
                         super.setAnchorTop(anchor);
@@ -134 +135 @@
                 invalidateCommonTrait(ItemAppearence.PreMoved);
                 
-                this._anchorTop = anchor;
-                this._anchorBottom = null;
+                this._anchoring.setTopAnchor(anchor);
                 
                 int oldY = getY();
@@ -148 +148 @@
 
         @Override
-        public void setAnchorBottom(Float anchor) {
+        public void setAnchorBottom(Integer anchor) {
                 if (!isLineEnd()) {
                         super.setAnchorBottom(anchor);
@@ -156 +156 @@
                 invalidateCommonTrait(ItemAppearence.PreMoved);
                 
-                this._anchorBottom = anchor;
-                this._anchorTop = null;
+                this._anchoring.setBottomAnchor(anchor);
                 
                 int oldY = getY();
                 if (anchor != null) {
-                        float deltaY = FrameGraphics.getMaxFrameSize().height - anchor
-                                        - getBoundsHeight() - oldY;
+                        float deltaY = DisplayController.getFramePaintArea().getHeight() - anchor - getBoundsHeight() - oldY;
                         anchorConnected(AnchorEdgeType.Bottom, deltaY);
                 }
@@ -173 +171 @@
 
         @Override
-        public void paint(Graphics2D g) {
+        public void paint() {
+                GraphicsManager g = EcosystemManager.getGraphicsManager();
                 if (isHighlighted() /* && !FreeItems.getInstance().contains(this) */) {
-                        Color highlightColor = getHighlightColor();
-                        g.setColor(highlightColor);
-                        g.setStroke(DOT_STROKE);
+                        Colour highlightColor = getHighlightColor();
+                        Fill fill = new Fill(highlightColor);
                         // g.setStroke()
                         // Draw the highlighting rectangle surrounding the dot
                         // this is drawn even if its part of a rectangle
 
-                        if (isVectorItem())
-                                updatePolygon();
-
-                        Rectangle rect = getPolygon().getBounds();
-                        if (_mode == HighlightMode.Enclosed ||
-                        // Make sure single dots are highlighted filled
-                                        this.getConnected().size() <= 1)
-                                g.fillRect(rect.x, rect.y, rect.width, rect.height);
-                        else if (_mode == HighlightMode.Connected){
-                                g.setStroke(HIGHLIGHT_STROKE);
-                                g.drawRect(rect.x, rect.y, rect.width, rect.height);
-                        }else if (_mode == HighlightMode.Normal) {
-                                g.fillOval(rect.x, rect.y, rect.width, rect.height);
+                        if (isVectorItem()) invalidateBounds();
+
+                        AxisAlignedBoxBounds bounds = getBoundingBox();
+                        if (_highlightMode == HighlightMode.Enclosed || this.getConnected().size() <= 1) { // Make sure single dots are highlighted filled
+                                g.drawRectangle(bounds.getTopLeft(), bounds.getSize(), 0.0f, fill, highlightColor, DOT_STROKE, null);
+                        } else if (_highlightMode == HighlightMode.Connected) {
+                                g.drawRectangle(bounds.getTopLeft(), bounds.getSize(), 0.0f, null, highlightColor, HIGHLIGHT_STROKE, null);
+                        } else if (_highlightMode == HighlightMode.Normal) {
+                                g.drawOval(bounds.getCentre(), bounds.getSize(), 0.0f, fill, highlightColor, DOT_STROKE);
                         }
                         // System.out.println(_mode.toString());
@@ -200 +194 @@
 
                 // dots on lines are hidden
-                if (getLines().size() > 0)
-                        return;
-
-                g.setColor(getPaintColor());
+                if (getLines().size() > 0) return;
 
                 int thick = (int) getThickness();
-                if (thick < MINIMUM_DOT_SIZE)
-                        thick = MINIMUM_DOT_SIZE;
-
-                int width = thick / 2;
-
+                if (thick < MINIMUM_DOT_SIZE) thick = MINIMUM_DOT_SIZE;
+                
+                Fill fill = _filled ? new Fill(getPaintColor()) : null;
+
+                // TODO: On testing, this code doesn't seem to work (can't change to any type except square). cts16
                 switch (_type) {
-                case circle:
-                        if (_filled)
-                                g.fillOval(getX() - width, getY() - width, thick, thick);
-                        else {
-                                g.drawOval(getX() - width, getY() - width, thick, thick);
-                        }
-                        break;
-                case diamond:
-                        int[] x = new int[4];
-                        int[] y = new int[4];
-
-                        x[0] = x[2] = getX();
-                        x[1] = getX() - width;
-                        x[3] = getX() + width;
-
-                        y[1] = y[3] = getY();
-                        y[0] = getY() - width;
-                        y[2] = getY() + width;
-
-                        if (_filled)
-                                g.fillPolygon(x, y, 4);
-                        else {
-                                g.drawPolygon(x, y, 4);
-                        }
-                        break;
-                case triangle:
-                        x = new int[3];
-                        y = new int[3];
-
-                        x[0] = getX();
-                        x[1] = getX() - width;
-                        x[2] = getX() + width;
-
-                        y[0] = getY() - width;
-                        y[1] = y[2] = getY() + width;
-
-                        if (_filled)
-                                g.fillPolygon(x, y, 3);
-                        else {
-                                g.drawPolygon(x, y, 3);
-                        }
-                        break;
-                case roundSquare:
-                        int arc = thick / 2;
-                        if (_filled)
-                                g.fillRoundRect(getX() - width, getY() - width, thick, thick,
-                                                arc, arc);
-                        else {
-                                g.drawRoundRect(getX() - width, getY() - width, thick, thick,
-                                                arc, arc);
-                        }
-                        break;
-                default:
-                        if (_filled)
-                                g.fillRect(getX() - width, getY() - width, thick, thick);
-                        else {
-                                g.drawRect(getX() - width, getY() - width, thick, thick);
-                        }
-
+                        case circle:
+                                g.drawOval(
+                                                new Point(getX(), getY()),
+                                                new Dimension(thick, thick),
+                                                0.0,
+                                                fill,
+                                                getPaintColor(),
+                                                null
+                                );
+                                break;
+                        case diamond:
+                                PolygonBounds diamond = PolygonBounds.getDiamond(thick, thick).translate(getX(), getY()).close();
+                                g.drawPolygon(diamond, null, null, 0.0, fill, getPaintColor(), null);
+                                break;
+                        case triangle:
+                                PolygonBounds triangle = PolygonBounds.getTriangle(thick, thick).translate(getX(), getY()).close();
+                                g.drawPolygon(triangle, null, null, 0.0, fill, getPaintColor(), null);
+                                break;
+                        case roundSquare:
+                                int arc = thick / 4;
+                                g.drawRectangle(
+                                        new Point(getX(), getY()),
+                                        new Dimension(thick, thick),
+                                        0.0,
+                                        fill,
+                                        getPaintColor(),
+                                        null,
+                                        new Dimension(arc, arc)
+                                );
+                                break;
+                        default:
+                                g.drawRectangle(
+                                                new Point(getX(), getY()),
+                                                new Dimension(thick, thick),
+                                                0.0,
+                                                fill,
+                                                getPaintColor(),
+                                                null,
+                                                null
+                                );
                 }
 
@@ -276 +248 @@
 
         /**
-         * Updates the points of the polygon surrounding this Dot
+         * Updates the bounds surrounding this Dot.
+         * TODO: Standardise Dot minimum size. cts16
          */
-        public void updatePolygon() {
+        public Bounds updateBounds()
+        {
                 int thick = Math.round(getThickness());
+                
                 // Sets a minimum size for the dot
                 thick = Math.max(thick, getGravity() * 2);
+                
+                // Include the gravity in the thickness
+                thick += 2 * getGravity();
+                
 
                 int x = getX() - thick / 2;
                 int y = getY() - thick / 2;
-
-                _poly = new Polygon();
-                _poly.addPoint(x - getGravity(), y - getGravity());
-                _poly.addPoint(x + thick + getGravity(), y - getGravity());
-                _poly.addPoint(x + thick + getGravity(), y + thick + getGravity());
-                _poly.addPoint(x - getGravity(), y + thick + getGravity());
+                
+                return new AxisAlignedBoxBounds(x, y, thick, thick);
         }
 
@@ -303 +278 @@
 
         @Override
-        public int setHighlightColor() {
-                super.setHighlightColor();
-
-                return Item.DEFAULT_CURSOR;
+        public void setHighlightColorToDefault() {
+                super.setHighlightColorToDefault();
+
+                //return Item.DEFAULT_CURSOR;
         }
 
         @Override
         public void setAnnotation(boolean val) {
-                DisplayIO.setCursorPosition(this.getPosition());
-                FrameKeyboardActions.replaceDot(this, '@');
+                DisplayController.setCursorPosition(this.getPosition());
+                Item.replaceDot(this, '@');
         }
 
@@ -406 +381 @@
                         if (parent != null && parent != current) {
                                 this.setParent(parent);
-                                if (DisplayIO.getCurrentSide() == 0)
-                                        this.setX(this.getX() - DisplayIO.getMiddle());
+                                if (DisplayController.getCurrentSide() == DisplayController.TwinFramesSide.LEFT)
+                                        this.setX(this.getX() - DisplayController.getTwinFramesSeparatorX());
                                 else
-                                        this.setX(this.getX() + DisplayIO.getMiddle());
+                                        this.setX(this.getX() + DisplayController.getTwinFramesSeparatorX());
                         }
                         break;
@@ -420 +395 @@
                         if (line.getID() < 0 && !current.getItems().contains(line)) {
                                 line.setID(current.getNextItemID());
-                                line.setHighlightColor();
+                                line.setHighlightColorToDefault();
                                 // Mike: Why was this line here?
                                 // anchor(line);
@@ -436 +411 @@
 
         @Override
-        public void lineColorChanged(Color c) {
+        public void lineColorChanged(Colour c) {
                 if (getColor() != c) {
                         setColor(c);
@@ -450 +425 @@
                 return super.dontSave();
         }
+
+        @Override
+        public float getSize()
+        {
+                return getThickness();
+        }
 }