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

Timestamp:

05/08/08 14:30:09 (16 years ago)

Author:

ra33

Message:

 

File:

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

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

@@ -3 +3 @@
 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.Frame;
 
 /**
@@ -19 +22 @@
         // Standard Item variables
 
+        private static final int _MINIMUM_DOT_SIZE = 6;
+
         // contains all dots (including this one) that form an enclosure
         // if this dot is part of an enclosing shape
@@ -32 +37 @@
 
         private boolean _filled = true;
-        
+
         protected boolean _filledHighlight = false;
 
@@ -108 +113 @@
         @Override
         public void paint(Graphics2D g) {
-                if (isHighlighted()) {
+                if (isHighlighted() /* && !Frame.FreeItems.contains(this) */) {
                         g.setColor(getHighlightColor());
                         // Draw the highlighting rectangle surrounding the dot
                         // this is drawn even if its part of a rectangle
-                        if (_filledHighlight)
-                                g.fillPolygon(getPolygon());
-                        else
-                                g.drawPolygon(getPolygon());
+                        Rectangle rect = getPolygon().getBounds();
+                        if (_mode == SelectedMode.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 == SelectedMode.Connected)
+                                g.drawRect(rect.x, rect.y, rect.width, rect.height);
+                        else if (_mode == SelectedMode.Normal) {
+                                g.fillOval(rect.x, rect.y, rect.width, rect.height);
+                        }
+                        //System.out.println(_mode.toString());
                 }
 
@@ -129 +141 @@
 
                 int width = thick / 2;
-
-                // if(_thickness < 1)
-                /*
-                 * if(_filled) g.fillRect(getX(), getY(), thick,thick); else
-                 * g.drawRect(getX(), getY(), thick,thick); else
-                 */
 
                 if (_pointType == Item.POINTTYPE_CIRCLE) {
@@ -168 +174 @@
                 int thick = (int) Math.ceil(getThickness());
                 // Sets a minimum size for the dot
-                thick = Math.max(thick, 10);
+                thick = Math.max(thick, _MINIMUM_DOT_SIZE);
 
                 int x = getX() - thick / 2;
@@ -205 +211 @@
 
         @Override
-        public int showHighlight(boolean val) {
-                super.showHighlight(val);
+        public int setSelectionColor() {
+                super.setSelectionColor();
 
                 return Item.DEFAULT_CURSOR;
@@ -353 +359 @@
                 return "P " + getID();
         }
-        
+
         @Override
         public void setFilledHighlight(boolean value) {
                 _filledHighlight = value;
         }
-        
+
         @Override
         public void delete() {
                 super.delete();
-                
-                for(Line l: this.getLines())
+
+                for (Line l : this.getLines())
                         l.delete();
         }