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

trunk/src/org/expeditee/items/Circle.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.awt.geom.Point2D;
 import java.util.Collection;
 import java.util.LinkedList;
+
+import org.expeditee.core.Colour;
+import org.expeditee.core.Dimension;
+import org.expeditee.core.Fill;
+import org.expeditee.core.Point;
+import org.expeditee.core.Stroke;
+import org.expeditee.core.bounds.AxisAlignedBoxBounds;
+import org.expeditee.core.bounds.CombinationBoxBounds;
+import org.expeditee.core.bounds.EllipticalBounds;
+import org.expeditee.core.bounds.PolygonBounds;
+import org.expeditee.gio.EcosystemManager;
 
 /**
@@ -42 +48 @@
          * @param _source
          */
-        public Circle(Text source) {
+        public Circle(Text source)
+        {
                 super(source);
                 // Collection<Item> connected = source.getAllConnected();
@@ -50 +57 @@
                 _center.addEnclosure(this);
                 _line.setHidden(true);
-                updatePolygon();
+                invalidateBounds();
         }
 
@@ -87 +94 @@
 
         @Override
-        public Polygon getEnclosedShape() {
+        public PolygonBounds getEnclosedShape() {
                 // assert(_poly != null);
                 // Ensure that vector items will gradient fill are painted OK!!
-                if (_poly == null) {
-                        updatePolygon();
-                }
-                return _poly;
+                return ((EllipticalBounds) updateBounds()).getPolygon(16);
         }
 
@@ -138 +142 @@
                 newCircle._line.setVisible(_line.isVisible());
                 newCircle._source.setVisible(_source.isVisible());
-                newCircle.updatePolygon();
+                newCircle.invalidateBounds();
                 return newCircle;
         }
@@ -152 +156 @@
 
         @Override
-        public boolean contains(int x, int y) {
+        public boolean contains(Point p) {
                 double radius = getRadius();
 
-                double distance = Math.sqrt(Math.pow(Math.abs(_center.getX() - x), 2)
-                                + Math.pow(Math.abs(_center.getY() - y), 2));
+                double distance = Math.sqrt(Math.pow(Math.abs(_center.getX() - p.x), 2)
+                                + Math.pow(Math.abs(_center.getY() - p.y), 2));
 
                 return Math.abs(distance - radius) < getGravity() * 2;
@@ -167 +171 @@
          */
         @Override
-        public void paint(Graphics2D g) {
+        public void paint() {
                 int radius = (int) Math.round(getRadius());
-                int diameter = radius * 2;
-                Color fillColor = getFillColor();
-                if (fillColor != null) {
-                        setFillPaint(g);
-                        g.fillOval(_center.getX() - radius, _center.getY() - radius,
-                                        diameter, diameter);
+                Point centre = new Point(_center.getX(), _center.getY());
+                Dimension diameters = new Dimension(radius * 2, radius * 2);
+                Fill fill = new Fill(getFillColor());
+                Colour lineColour = null;
+                Stroke lineStroke = null;
+                if (isHighlighted()) {
+                        lineColour = getHighlightColor();
+                        lineStroke = HIGHLIGHT_STROKE;
+                } else if (getThickness() > 0 || getFillColor() == null) {
+                        lineColour = getPaintColor();
+                        lineStroke = _line.getStroke();
                 }
-                if (getThickness() > 0 || fillColor == null) {
-                        Color lineColor = getPaintColor();
-                        g.setColor(lineColor);
-                        g.setStroke(_line.getStroke());
-                        g.drawOval(_center.getX() - radius, _center.getY() - radius,
-                                        diameter, diameter);
+                
+                EcosystemManager.getGraphicsManager().drawOval(centre, diameters, 0.0f, fill, lineColour, lineStroke);
+                
+                if (isHighlighted()) {
+                        _center.paint();
                 }
-                // Arc version, same result but allows for portions of the circle to be
-                // drawn
-                // g.drawArc(end.getX() - (distance / 2), end.getY() - (distance / 2),
-                // distance, distance, 0, 360);
-
-                if (isHighlighted()) {
-                        // Flag the background color of the circle so that the item will be
-                        // drawn with alternate color if the background is the same as
-                        // the highlight}
-                        _center.paint(g);
-                        Color highlightColor = getHighlightColor();
-                        g.setColor(highlightColor);
-                        g.setStroke(HIGHLIGHT_STROKE);
-                        g.drawOval(_center.getX() - radius, _center.getY() - radius,
-                                        diameter, diameter);
-                }
-        }
-
-        @Override
-        public void setHighlightMode(HighlightMode mode, Color color) {
-                _center.setHighlightMode(mode, color);
-                super.setHighlightMode(mode, color);
-        }
-
-        @Override
-        public int setHighlightColor(Color c) {
+        }
+
+        @Override
+        public void setHighlightModeAndColour(HighlightMode mode, Colour color) {
+                _center.setHighlightModeAndColour(mode, color);
+                super.setHighlightModeAndColour(mode, color);
+        }
+
+        @Override
+        public void setHighlightColor(Colour c) {
                 _center.setHighlightColor(c);
-                return super.setHighlightColor(c);
-        }
-
-        @Override
-        public void setFillColor(Color c) {
+                /*return*/ super.setHighlightColor(c);
+        }
+
+        @Override
+        public void setFillColor(Colour c) {
                 super.setFillColor(c);
                 _center.setColor(c);
@@ -221 +213 @@
 
         @Override
-        public void setGradientColor(Color c) {
+        public void setGradientColor(Colour c) {
                 super.setGradientColor(c);
                 invalidateCommonTrait(ItemAppearence.GradientColor);
@@ -255 +247 @@
          */
         @Override
-        public void updatePolygon() {
-                double radius = getRadius();
-                // Approximation of circle for mouse interaction
-                int points = 20;
-
-                double radians = 0.0;
-                int xPoints[] = new int[points];
-                int yPoints[] = new int[xPoints.length];
-
-                for (int i = 0; i < xPoints.length; i++) {
-                        xPoints[i] = (int) Math.round(radius * Math.cos(radians));
-                        yPoints[i] = (int) Math.round(radius * Math.sin(radians));
-                        radians += (2.0 * Math.PI) / xPoints.length;
-                }
-
-                _poly = new Polygon(xPoints, yPoints, xPoints.length);
-                _poly.translate(_center.getX(), _center.getY());
-                return;
+        public EllipticalBounds updateBounds()
+        {
+                return new EllipticalBounds(_center.getPosition(), (int) (getRadius() * 2));
         }
 
@@ -280 +257 @@
         }
 
-        /**
-         * Resizes the circle from the center.
-         */
-        @Override
-        public void setSize(float size) {
+        /** Resizes the circle from the center. */
+        @Override
+        public void setSize(float size)
+        {
                 double ratio = size / getRadius();
                 
@@ -290 +266 @@
                 _source.translate(_center.getPosition(), ratio);
 
-                updatePolygon();
+                invalidateBounds();
         }
 
@@ -303 +279 @@
         }
 
-        @Override
-        public void translate(Point2D origin, double ratio) {
-                updatePolygon();
+        // TODO: Why is this commented out? cts16
+        @Override
+        public void translate(Point origin, double ratio)
+        {
+                invalidateBounds();
                 // _center.translate(origin, ratio);
                 // super.translate(origin, ratio);
@@ -311 +289 @@
 
         @Override
-        public Rectangle[] getDrawingArea() {
+        public AxisAlignedBoxBounds getDrawingArea() {
 
                 float thickness = getThickness();
@@ -318 +296 @@
                 int size = (int) ((2 * radius) + 3.0 + thickness);
 
-                return new Rectangle[] { new Rectangle((int) (_center.getX() - radius
+                return new AxisAlignedBoxBounds((int) (_center.getX() - radius
                                 - 0.5 - (thickness / 2.0)), (int) (_center.getY() - radius
-                                - 0.5 - (thickness / 2.0)), size, size) };
+                                - 0.5 - (thickness / 2.0)), size, size);
         }