editable colors for boards

This commit is contained in:
bancika
2011-01-10 23:43:01 +00:00
parent c2e5b6d20c
commit ce63511188
5 changed files with 25 additions and 41 deletions
@@ -17,15 +17,17 @@ public abstract class AbstractBoard extends AbstractTransparentComponent<String>
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public static Color BOARD_COLOR = Color.decode("#BCED91");
public static Color BORDER_COLOR = BOARD_COLOR.darker();
protected String name; protected String name;
protected String value; protected String value;
protected Point[] controlPoints = new Point[] { protected Point[] controlPoints = new Point[] {
new Point((int) (-5 * Constants.GRID), (int) (-5 * Constants.GRID)), new Point((int) (-5 * Constants.GRID), (int) (-5 * Constants.GRID)),
new Point((int) (5 * Constants.GRID), (int) (5 * Constants.GRID)) }; new Point((int) (5 * Constants.GRID), (int) (5 * Constants.GRID)) };
protected abstract Color getBoardColor(); protected Color boardColor = BOARD_COLOR;
protected Color borderColor = BORDER_COLOR;
protected abstract Color getBorderColor();
@Override @Override
public void draw(Graphics2D g2d, ComponentState componentState, Project project) { public void draw(Graphics2D g2d, ComponentState componentState, Project project) {
@@ -36,16 +38,34 @@ public abstract class AbstractBoard extends AbstractTransparentComponent<String>
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha
/ MAX_ALPHA)); / MAX_ALPHA));
} }
g2d.setColor(getBoardColor()); g2d.setColor(boardColor);
g2d.fillRect(controlPoints[0].x, controlPoints[0].y, controlPoints[1].x g2d.fillRect(controlPoints[0].x, controlPoints[0].y, controlPoints[1].x
- controlPoints[0].x, controlPoints[1].y - controlPoints[0].y); - controlPoints[0].x, controlPoints[1].y - controlPoints[0].y);
g2d.setComposite(oldComposite); g2d.setComposite(oldComposite);
} }
g2d.setColor(getBorderColor()); g2d.setColor(borderColor);
g2d.drawRect(controlPoints[0].x, controlPoints[0].y, controlPoints[1].x g2d.drawRect(controlPoints[0].x, controlPoints[0].y, controlPoints[1].x
- controlPoints[0].x, controlPoints[1].y - controlPoints[0].y); - controlPoints[0].x, controlPoints[1].y - controlPoints[0].y);
} }
@EditableProperty(name = "Color")
public Color getBoardColor() {
return boardColor;
}
public void setBoardColor(Color boardColor) {
this.boardColor = boardColor;
}
@EditableProperty(name = "Border")
public Color getBorderColor() {
return borderColor;
}
public void setBorderColor(Color borderColor) {
this.borderColor = borderColor;
}
@Override @Override
public int getControlPointCount() { public int getControlPointCount() {
return controlPoints.length; return controlPoints.length;
@@ -1,6 +1,5 @@
package org.diylc.components.boards; package org.diylc.components.boards;
import java.awt.Color;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import org.diylc.core.IDIYComponent; import org.diylc.core.IDIYComponent;
@@ -11,19 +10,6 @@ public class BlankBoard extends AbstractBoard {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public static Color BOARD_COLOR = Color.decode("#BCED91");
public static Color BORDER_COLOR = BOARD_COLOR.darker();
@Override
protected Color getBoardColor() {
return BOARD_COLOR;
}
@Override
protected Color getBorderColor() {
return BORDER_COLOR;
}
@Override @Override
public void drawIcon(Graphics2D g2d, int width, int height) { public void drawIcon(Graphics2D g2d, int width, int height) {
g2d.setColor(BOARD_COLOR); g2d.setColor(BOARD_COLOR);
@@ -20,9 +20,7 @@ public class PerfBoard extends AbstractBoard {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public static Color BOARD_COLOR = Color.decode("#BCED91");
public static Color COPPER_COLOR = Color.decode("#B87333"); public static Color COPPER_COLOR = Color.decode("#B87333");
public static Color BORDER_COLOR = BOARD_COLOR.darker();
private static Size SPACING = new Size(0.1d, SizeUnit.in); private static Size SPACING = new Size(0.1d, SizeUnit.in);
private static Size PAD_SIZE = new Size(0.08d, SizeUnit.in); private static Size PAD_SIZE = new Size(0.08d, SizeUnit.in);
@@ -133,16 +131,6 @@ public class PerfBoard extends AbstractBoard {
this.spacing = spacing; this.spacing = spacing;
} }
@Override
protected Color getBoardColor() {
return BOARD_COLOR;
}
@Override
protected Color getBorderColor() {
return BORDER_COLOR;
}
@Override @Override
public void drawIcon(Graphics2D g2d, int width, int height) { public void drawIcon(Graphics2D g2d, int width, int height) {
g2d.setColor(BOARD_COLOR); g2d.setColor(BOARD_COLOR);
@@ -135,16 +135,6 @@ public class VeroBoard extends AbstractBoard {
this.spacing = spacing; this.spacing = spacing;
} }
@Override
protected Color getBoardColor() {
return BOARD_COLOR;
}
@Override
protected Color getBorderColor() {
return BORDER_COLOR;
}
@Override @Override
public void drawIcon(Graphics2D g2d, int width, int height) { public void drawIcon(Graphics2D g2d, int width, int height) {
g2d.setColor(BOARD_COLOR); g2d.setColor(BOARD_COLOR);