Changeset 427 for trunk/src/org/expeditee/items/Dot.java

Timestamp:

01/07/09 13:25:13 (15 years ago)

Author:

ra33

Message:

 

File:

• trunk/src/org/expeditee/items/Dot.java (modified) (6 diffs)

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

@@ -26 +26 @@
         // Standard Item variables
 
-        //private static final int _MINIMUM_DOT_SIZE = 6;
+        // private static final int _MINIMUM_DOT_SIZE = 6;
 
         private static final int MINIMUM_DOT_SIZE = 2;
-
-        private int _pointType = Item.POINTTYPE_SQUARE;
-
-        private boolean _filled = true;
 
         public Dot(int id) {
@@ -55 +51 @@
         }
 
-        public void setPointType(int type) {
-                _pointType = type;
-        }
-
-        public void useFilledPoints(boolean val) {
-                _filled = val;
-        }
-
         @Override
         public void setColor(Color c) {
@@ -116 +104 @@
                         Color highlightColor = getHighlightColor();
                         g.setColor(highlightColor);
-                        g.setStroke(HIGHLIGHT_STROKE);
+                        g.setStroke(DOT_STROKE);
                         // g.setStroke()
                         // Draw the highlighting rectangle surrounding the dot
                         // this is drawn even if its part of a rectangle
-                        
-                        if(isVectorItem())
+
+                        if (isVectorItem())
                                 updatePolygon();
-                        
+
                         Rectangle rect = getPolygon().getBounds();
                         if (_mode == HighlightMode.Enclosed ||
@@ -129 +117 @@
                                         this.getConnected().size() <= 1)
                                 g.fillRect(rect.x, rect.y, rect.width, rect.height);
-                        else if (_mode == HighlightMode.Connected)
+                        else if (_mode == HighlightMode.Connected){
+                                g.setStroke(HIGHLIGHT_STROKE);
                                 g.drawRect(rect.x, rect.y, rect.width, rect.height);
-                        else if (_mode == HighlightMode.Normal) {
+                        }else if (_mode == HighlightMode.Normal) {
                                 g.fillOval(rect.x, rect.y, rect.width, rect.height);
                         }
@@ -149 +138 @@
                 int width = thick / 2;
 
-                if (_pointType == Item.POINTTYPE_CIRCLE) {
-                        int points = 40;
-
-                        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] = getX() + (int) (width * Math.cos(radians));
-                                yPoints[i] = getY() + (int) (width * Math.sin(radians));
-                                radians += (2.0 * Math.PI) / xPoints.length;
-                        }
-
-                        if (_filled)
-                                g.fillPolygon(new Polygon(xPoints, yPoints, xPoints.length));
-                        else
-                                g.drawPolygon(new Polygon(xPoints, yPoints, xPoints.length));
-                } else {
+                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
+                        else {
                                 g.drawRect(getX() - width, getY() - width, thick, thick);
+                        }
+
                 }
 
@@ -198 +225 @@
 
                 Item.DuplicateItem(this, copy);
-
-                copy.setThickness(getThickness());
-                copy.setPointType(_pointType);
-                copy.useFilledPoints(_filled);
 
                 return copy;