BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-10 09:12:09 +10:00
Code Issues Packages Projects Releases Wiki Activity

added color properties to abstract leaded comp

Browse Source
This commit is contained in:
bancika
2011-01-09 13:11:46 +00:00
parent f2fa8195b3
commit c898fee28e
10 changed files with 80 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar
BIN
View File
Binary file not shown.
diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/components/AbstractLeadedDIYComponent.java
+28 -8
View File
@@ -36,6 +36,8 @@ public abstract class AbstractLeadedDIYComponent<T> extends AbstractTransparentC
protected Size height; protected Size height;
protected Point[] points = new Point[] { new Point((int) (-Constants.GRID * 5), 0), protected Point[] points = new Point[] { new Point((int) (-Constants.GRID * 5), 0),
new Point((int) (Constants.GRID * 5), 0) }; new Point((int) (Constants.GRID * 5), 0) };
protected Color bodyColor = getDefaultBodyColor();
protected Color borderColor = getDefaultBorderColor();
protected AbstractLeadedDIYComponent() { protected AbstractLeadedDIYComponent() {
super(); super();
@@ -68,14 +70,14 @@ public abstract class AbstractLeadedDIYComponent<T> extends AbstractTransparentC
protected abstract Shape getBodyShape(); protected abstract Shape getBodyShape();
/** /**
* @return component body color. * @return default component body color.
*/ */
protected abstract Color getBodyColor(); protected abstract Color getDefaultBodyColor();
/** /**
* @return component border color. * @return default component border color.
*/ */
protected abstract Color getBorderColor(); protected abstract Color getDefaultBorderColor();
/** /**
* @return default lead thickness. Override this method to change it. * @return default lead thickness. Override this method to change it.
@@ -133,15 +135,15 @@ public abstract class AbstractLeadedDIYComponent<T> extends AbstractTransparentC
if (componentState != ComponentState.DRAGGING) { if (componentState != ComponentState.DRAGGING) {
Composite oldComposite = g2d.getComposite(); Composite oldComposite = g2d.getComposite();
if (alpha < MAX_ALPHA) { if (alpha < MAX_ALPHA) {
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha
1f * alpha / MAX_ALPHA)); / MAX_ALPHA));
} }
g2d.setColor(getBodyColor()); g2d.setColor(bodyColor);
g2d.fill(shape); g2d.fill(shape);
g2d.setComposite(oldComposite); g2d.setComposite(oldComposite);
} }
g2d.setStroke(new BasicStroke(1)); g2d.setStroke(new BasicStroke(1));
g2d.setColor(getBorderColor()); g2d.setColor(borderColor);
g2d.draw(shape); g2d.draw(shape);
// Draw label. // Draw label.
g2d.setFont(Constants.LABEL_FONT); g2d.setFont(Constants.LABEL_FONT);
@@ -154,6 +156,24 @@ public abstract class AbstractLeadedDIYComponent<T> extends AbstractTransparentC
(int) (shapeRect.height - textRect.getHeight()) / 2 + fontMetrics.getAscent()); (int) (shapeRect.height - textRect.getHeight()) / 2 + fontMetrics.getAscent());
} }
@EditableProperty(name = "Color")
public Color getBodyColor() {
return bodyColor;
}
public void setBodyColor(Color bodyColor) {
this.bodyColor = bodyColor;
}
@EditableProperty(name = "Border")
public Color getBorderColor() {
return borderColor;
}
public void setBorderColor(Color borderColor) {
this.borderColor = borderColor;
}
@EditableProperty(defaultable = true) @EditableProperty(defaultable = true)
public Size getWidth() { public Size getWidth() {
return width; return width;
diy-layout-creator --username bancika@gmail.com/Library/lib/diylc.jar
BIN
View File
Binary file not shown.
diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java
+12 -5
View File
@@ -36,7 +36,7 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
protected Point[] controlPoints = new Point[] { new Point(0, 0) }; protected Point[] controlPoints = new Point[] { new Point(0, 0) };
protected RoundRectangle2D body; protected RoundRectangle2D body;
protected String name; protected String name;
protected ToggleSwitchType switchType = ToggleSwitchType.SPST; protected ToggleSwitchType switchType = ToggleSwitchType.DPDT;
public MiniToggleSwitch() { public MiniToggleSwitch() {
super(); super();
@@ -167,8 +167,8 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
if (componentState != ComponentState.DRAGGING) { if (componentState != ComponentState.DRAGGING) {
Composite oldComposite = g2d.getComposite(); Composite oldComposite = g2d.getComposite();
if (alpha < MAX_ALPHA) { if (alpha < MAX_ALPHA) {
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha
1f * alpha / MAX_ALPHA)); / MAX_ALPHA));
} }
g2d.setColor(BODY_COLOR); g2d.setColor(BODY_COLOR);
g2d.fill(body); g2d.fill(body);
@@ -194,7 +194,14 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
@Override @Override
public void drawIcon(Graphics2D g2d, int width, int height) { public void drawIcon(Graphics2D g2d, int width, int height) {
// TODO Auto-generated method stub int circleSize = 5 * width / 32;
g2d.setColor(BODY_COLOR);
g2d.fillRoundRect(width / 4, 1, width / 2, height - 2, circleSize, circleSize);
g2d.setColor(BORDER_COLOR);
g2d.drawRoundRect(width / 4, 1, width / 2, height - 2, circleSize, circleSize);
g2d.setColor(CIRCLE_COLOR);
for (int i = 1; i <= 3; i++) {
g2d.fillOval(width / 2 - circleSize / 2, i * height / 4 - 3, circleSize, circleSize);
}
} }
} }
diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/interconnects/Jumper.java
+15 -3
View File
@@ -17,13 +17,25 @@ public class Jumper extends AbstractLeadedDIYComponent<Void> {
public void drawIcon(Graphics2D g2d, int width, int height) { public void drawIcon(Graphics2D g2d, int width, int height) {
} }
@Deprecated
public Color getBodyColor() {
return super.getBodyColor();
};
@Deprecated
@Override
public Color getBorderColor() {
// TODO Auto-generated method stub
return super.getBorderColor();
}
@Deprecated @Deprecated
@Override @Override
public Byte getAlpha() { public Byte getAlpha() {
return super.getAlpha(); return super.getAlpha();
} }
@Deprecated @Deprecated
@Override @Override
public Size getWidth() { public Size getWidth() {
@@ -48,12 +60,12 @@ public class Jumper extends AbstractLeadedDIYComponent<Void> {
} }
@Override @Override
protected Color getBodyColor() { protected Color getDefaultBodyColor() {
return null; return null;
} }
@Override @Override
protected Color getBorderColor() { protected Color getDefaultBorderColor() {
return null; return null;
} }
diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/interconnects/Trace.java
+15 -3
View File
@@ -45,7 +45,19 @@ public class Trace extends AbstractLeadedDIYComponent<Void> {
public void setLeadThickness(Size leadThickness) { public void setLeadThickness(Size leadThickness) {
this.leadThickness = leadThickness; this.leadThickness = leadThickness;
} }
@Deprecated
public Color getBodyColor() {
return super.getBodyColor();
};
@Deprecated
@Override
public Color getBorderColor() {
// TODO Auto-generated method stub
return super.getBorderColor();
}
@Deprecated @Deprecated
@Override @Override
public Byte getAlpha() { public Byte getAlpha() {
@@ -76,12 +88,12 @@ public class Trace extends AbstractLeadedDIYComponent<Void> {
} }
@Override @Override
protected Color getBodyColor() { protected Color getDefaultBodyColor() {
return null; return null;
} }
@Override @Override
protected Color getBorderColor() { protected Color getDefaultBorderColor() {
return null; return null;
} }
diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/AxialFilmCapacitor.java
+2 -2
View File
@@ -59,12 +59,12 @@ public class AxialFilmCapacitor extends AbstractLeadedDIYComponent<Capacitance>
} }
@Override @Override
protected Color getBodyColor() { protected Color getDefaultBodyColor() {
return BODY_COLOR; return BODY_COLOR;
} }
@Override @Override
protected Color getBorderColor() { protected Color getDefaultBorderColor() {
return BORDER_COLOR; return BORDER_COLOR;
} }
diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialCeramicDiskCapacitor.java
+2 -2
View File
@@ -59,12 +59,12 @@ public class RadialCeramicDiskCapacitor extends AbstractLeadedDIYComponent<Capac
} }
@Override @Override
protected Color getBodyColor() { protected Color getDefaultBodyColor() {
return BODY_COLOR; return BODY_COLOR;
} }
@Override @Override
protected Color getBorderColor() { protected Color getDefaultBorderColor() {
return BORDER_COLOR; return BORDER_COLOR;
} }
diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialFilmCapacitor.java
+4 -4
View File
@@ -43,9 +43,9 @@ public class RadialFilmCapacitor extends AbstractLeadedDIYComponent<Capacitance>
g2d.setColor(LEAD_COLOR); g2d.setColor(LEAD_COLOR);
g2d.drawLine(0, height / 2, width, height / 2); g2d.drawLine(0, height / 2, width, height / 2);
g2d.setColor(BODY_COLOR); g2d.setColor(BODY_COLOR);
g2d.fillRoundRect(4, height / 2 - 3, width - 8, 6, 2, 2); g2d.fillRoundRect(4, height / 2 - 3, width - 8, 6, 5, 5);
g2d.setColor(BORDER_COLOR); g2d.setColor(BORDER_COLOR);
g2d.drawRoundRect(4, height / 2 - 3, width - 8, 6, 2, 2); g2d.drawRoundRect(4, height / 2 - 3, width - 8, 6, 5, 5);
} }
@Override @Override
@@ -59,12 +59,12 @@ public class RadialFilmCapacitor extends AbstractLeadedDIYComponent<Capacitance>
} }
@Override @Override
protected Color getBodyColor() { protected Color getDefaultBodyColor() {
return BODY_COLOR; return BODY_COLOR;
} }
@Override @Override
protected Color getBorderColor() { protected Color getDefaultBorderColor() {
return BORDER_COLOR; return BORDER_COLOR;
} }
diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Resistor.java
+2 -2
View File
@@ -59,12 +59,12 @@ public class Resistor extends AbstractLeadedDIYComponent<Resistance> {
} }
@Override @Override
protected Color getBodyColor() { protected Color getDefaultBodyColor() {
return BODY_COLOR; return BODY_COLOR;
} }
@Override @Override
protected Color getBorderColor() { protected Color getDefaultBorderColor() {
return BORDER_COLOR; return BORDER_COLOR;
} }