diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar b/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar index ea89006d..0af57477 100644 Binary files a/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar and b/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar differ diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/components/AbstractLeadedDIYComponent.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/components/AbstractLeadedDIYComponent.java index ed33984f..2961c915 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/components/AbstractLeadedDIYComponent.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/components/AbstractLeadedDIYComponent.java @@ -36,6 +36,8 @@ public abstract class AbstractLeadedDIYComponent extends AbstractTransparentC protected Size height; protected Point[] points = new Point[] { new Point((int) (-Constants.GRID * 5), 0), new Point((int) (Constants.GRID * 5), 0) }; + protected Color bodyColor = getDefaultBodyColor(); + protected Color borderColor = getDefaultBorderColor(); protected AbstractLeadedDIYComponent() { super(); @@ -68,14 +70,14 @@ public abstract class AbstractLeadedDIYComponent extends AbstractTransparentC 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. @@ -133,15 +135,15 @@ public abstract class AbstractLeadedDIYComponent extends AbstractTransparentC if (componentState != ComponentState.DRAGGING) { Composite oldComposite = g2d.getComposite(); if (alpha < MAX_ALPHA) { - g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, - 1f * alpha / MAX_ALPHA)); + g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha + / MAX_ALPHA)); } - g2d.setColor(getBodyColor()); + g2d.setColor(bodyColor); g2d.fill(shape); g2d.setComposite(oldComposite); } g2d.setStroke(new BasicStroke(1)); - g2d.setColor(getBorderColor()); + g2d.setColor(borderColor); g2d.draw(shape); // Draw label. g2d.setFont(Constants.LABEL_FONT); @@ -154,6 +156,24 @@ public abstract class AbstractLeadedDIYComponent extends AbstractTransparentC (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) public Size getWidth() { return width; diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/lib/diylc.jar b/ diy-layout-creator --username bancika@gmail.com/Library/lib/diylc.jar index c957a869..81783128 100644 Binary files a/ diy-layout-creator --username bancika@gmail.com/Library/lib/diylc.jar and b/ diy-layout-creator --username bancika@gmail.com/Library/lib/diylc.jar differ diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java index 9e1fc172..0decdca4 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java @@ -36,7 +36,7 @@ public class MiniToggleSwitch extends AbstractTransparentComponent { 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 @Override public Byte getAlpha() { return super.getAlpha(); } - + @Deprecated @Override public Size getWidth() { @@ -48,12 +60,12 @@ public class Jumper extends AbstractLeadedDIYComponent { } @Override - protected Color getBodyColor() { + protected Color getDefaultBodyColor() { return null; } @Override - protected Color getBorderColor() { + protected Color getDefaultBorderColor() { return null; } diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/interconnects/Trace.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/interconnects/Trace.java index 14bf0889..2ce92209 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/interconnects/Trace.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/interconnects/Trace.java @@ -45,7 +45,19 @@ public class Trace extends AbstractLeadedDIYComponent { public void setLeadThickness(Size 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 @Override public Byte getAlpha() { @@ -76,12 +88,12 @@ public class Trace extends AbstractLeadedDIYComponent { } @Override - protected Color getBodyColor() { + protected Color getDefaultBodyColor() { return null; } @Override - protected Color getBorderColor() { + protected Color getDefaultBorderColor() { return null; } diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/AxialFilmCapacitor.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/AxialFilmCapacitor.java index cd057189..432c6aa2 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/AxialFilmCapacitor.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/AxialFilmCapacitor.java @@ -59,12 +59,12 @@ public class AxialFilmCapacitor extends AbstractLeadedDIYComponent } @Override - protected Color getBodyColor() { + protected Color getDefaultBodyColor() { return BODY_COLOR; } @Override - protected Color getBorderColor() { + protected Color getDefaultBorderColor() { return BORDER_COLOR; } diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialCeramicDiskCapacitor.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialCeramicDiskCapacitor.java index ea5834d8..1bc9cb84 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialCeramicDiskCapacitor.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialCeramicDiskCapacitor.java @@ -59,12 +59,12 @@ public class RadialCeramicDiskCapacitor extends AbstractLeadedDIYComponent g2d.setColor(LEAD_COLOR); g2d.drawLine(0, height / 2, width, height / 2); 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.drawRoundRect(4, height / 2 - 3, width - 8, 6, 2, 2); + g2d.drawRoundRect(4, height / 2 - 3, width - 8, 6, 5, 5); } @Override @@ -59,12 +59,12 @@ public class RadialFilmCapacitor extends AbstractLeadedDIYComponent } @Override - protected Color getBodyColor() { + protected Color getDefaultBodyColor() { return BODY_COLOR; } @Override - protected Color getBorderColor() { + protected Color getDefaultBorderColor() { return BORDER_COLOR; } diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Resistor.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Resistor.java index 70ebabc1..30165082 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Resistor.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Resistor.java @@ -59,12 +59,12 @@ public class Resistor extends AbstractLeadedDIYComponent { } @Override - protected Color getBodyColor() { + protected Color getDefaultBodyColor() { return BODY_COLOR; } @Override - protected Color getBorderColor() { + protected Color getDefaultBorderColor() { return BORDER_COLOR; }