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 9a0a7402..c957a869 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/boards/BlankBoard.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/boards/BlankBoard.java index faf198ed..99d26aaf 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/boards/BlankBoard.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/boards/BlankBoard.java @@ -6,7 +6,7 @@ import java.awt.Graphics2D; import org.diylc.core.ComponentLayer; import org.diylc.core.annotations.ComponentDescriptor; -@ComponentDescriptor(name = "Blank Board", category = "Boards", author = "Branislav Stojkovic", componentLayer = ComponentLayer.BOARD, instanceNamePrefix = "B", desciption = "Blank FR4 board") +@ComponentDescriptor(name = "Blank Board", category = "Boards", author = "Branislav Stojkovic", componentLayer = ComponentLayer.BOARD, instanceNamePrefix = "B", desciption = "Blank circuit board") public class BlankBoard extends AbstractBoard { private static final long serialVersionUID = 1L; @@ -26,6 +26,9 @@ public class BlankBoard extends AbstractBoard { @Override public void drawIcon(Graphics2D g2d, int width, int height) { - + g2d.setColor(BOARD_COLOR); + g2d.fillRect(2, 2, width - 4, height - 4); + g2d.setColor(BORDER_COLOR); + g2d.drawRect(2, 2, width - 4, height - 4); } } diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/boards/PerfBoard.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/boards/PerfBoard.java index 4baad47a..2ef79f24 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/boards/PerfBoard.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/boards/PerfBoard.java @@ -136,6 +136,13 @@ public class PerfBoard extends AbstractBoard { @Override public void drawIcon(Graphics2D g2d, int width, int height) { - + g2d.setColor(BOARD_COLOR); + g2d.fillRect(2, 2, width - 4, height - 4); + g2d.setColor(BORDER_COLOR); + g2d.drawRect(2, 2, width - 4, height - 4); + g2d.setColor(COPPER_COLOR); + g2d.fillOval(width / 4, width / 4, width / 2, width / 2); + g2d.setColor(Constants.CANVAS_COLOR); + g2d.fillOval(width / 2 - 1, width / 2 - 1, 2, 2); } } diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/boards/VeroBoard.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/boards/VeroBoard.java index 15cd14da..49b48164 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/boards/VeroBoard.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/boards/VeroBoard.java @@ -14,7 +14,7 @@ import org.diylc.core.measures.Size; import org.diylc.core.measures.SizeUnit; import org.diylc.utils.Constants; -@ComponentDescriptor(name = "Vero Board", category = "Boards", author = "Branislav Stojkovic", componentLayer = ComponentLayer.BOARD, instanceNamePrefix = "B", desciption = "Perforated FR4 board with solder pads spaced 0.1 inch apart") +@ComponentDescriptor(name = "Vero Board", category = "Boards", author = "Branislav Stojkovic", componentLayer = ComponentLayer.BOARD, instanceNamePrefix = "B", desciption = "Perforated FR4 board with copper strips connecting all holes in a row") public class VeroBoard extends AbstractBoard { private static final long serialVersionUID = 1L; @@ -135,6 +135,14 @@ public class VeroBoard extends AbstractBoard { @Override public void drawIcon(Graphics2D g2d, int width, int height) { - + g2d.setColor(BOARD_COLOR); + g2d.fillRect(2, 2, width - 4, height - 4); + g2d.setColor(BORDER_COLOR); + g2d.drawRect(2, 2, width - 4, height - 4); + g2d.setColor(COPPER_COLOR); + g2d.fillRect(4, width / 4, width - 8, width / 2); + g2d.setColor(Constants.CANVAS_COLOR); + g2d.fillOval(width / 3 - 1, width / 2 - 1, 2, 2); + g2d.fillOval(2 * width / 3 - 1, width / 2 - 1, 2, 2); } } diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/interconnects/HookupWire.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/interconnects/HookupWire.java index f65c38f6..ab16ac90 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/interconnects/HookupWire.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/interconnects/HookupWire.java @@ -39,7 +39,7 @@ public class HookupWire extends AbstractTransparentComponent { public void draw(Graphics2D g2d, ComponentState componentState, Project project) { if (componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING) { g2d.setStroke(new BasicStroke(1, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER, 10f, - new float[] {2f, 3f }, 5f)); + new float[] { 2f, 3f }, 5f)); g2d.setColor(GUIDELINE_COLOR); g2d.drawLine(controlPoints[0].x, controlPoints[0].y, controlPoints[1].x, controlPoints[1].y); @@ -56,8 +56,8 @@ public class HookupWire extends AbstractTransparentComponent { 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(color.darker()); g2d.setStroke(new BasicStroke(thickness)); @@ -83,7 +83,7 @@ public class HookupWire extends AbstractTransparentComponent { controlPoints[index].setLocation(point); } - @EditableProperty + @EditableProperty(name = "AWG") @Override public AWG getValue() { return value; diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/interconnects/Jumper.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/interconnects/Jumper.java index 02a1cfaf..4d4f2597 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/interconnects/Jumper.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/interconnects/Jumper.java @@ -58,7 +58,7 @@ public class Jumper extends AbstractLeadedDIYComponent { } @Override - protected Shape getComponentShape() { + protected Shape getBodyShape() { 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 bb19f680..14bf0889 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 @@ -86,7 +86,7 @@ public class Trace extends AbstractLeadedDIYComponent { } @Override - protected Shape getComponentShape() { + protected Shape getBodyShape() { 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 7f0eebbc..cd057189 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 @@ -39,7 +39,13 @@ public class AxialFilmCapacitor extends AbstractLeadedDIYComponent } public void drawIcon(Graphics2D g2d, int width, int height) { - g2d.drawString("C", 10, 10); + g2d.rotate(-Math.PI / 4, width / 2, height / 2); + g2d.setColor(LEAD_COLOR); + g2d.drawLine(0, height / 2, width, height / 2); + g2d.setColor(BODY_COLOR); + g2d.fillRect(4, height / 2 - 3, width - 8, 6); + g2d.setColor(BORDER_COLOR); + g2d.drawRect(4, height / 2 - 3, width - 8, 6); } @Override @@ -63,7 +69,7 @@ public class AxialFilmCapacitor extends AbstractLeadedDIYComponent } @Override - protected Shape getComponentShape() { + protected Shape getBodyShape() { return new Rectangle2D.Double(0f, 0f, getWidth().convertToPixels(), getHeight() .convertToPixels()); } 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 25ef66a9..ea5834d8 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 @@ -39,7 +39,13 @@ public class RadialCeramicDiskCapacitor extends AbstractLeadedDIYComponent } public void drawIcon(Graphics2D g2d, int width, int height) { - g2d.drawString("C", 10, 10); + g2d.rotate(-Math.PI / 4, width / 2, height / 2); + 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.setColor(BORDER_COLOR); + g2d.drawRoundRect(4, height / 2 - 3, width - 8, 6, 2, 2); } @Override @@ -63,7 +69,7 @@ public class RadialFilmCapacitor extends AbstractLeadedDIYComponent } @Override - protected Shape getComponentShape() { + protected Shape getBodyShape() { double radius = getHeight().convertToPixels() * 0.7; return new RoundRectangle2D.Double(0f, 0f, getWidth().convertToPixels(), getHeight() .convertToPixels(), radius, radius); 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 9598cad8..70ebabc1 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 @@ -39,7 +39,13 @@ public class Resistor extends AbstractLeadedDIYComponent { } public void drawIcon(Graphics2D g2d, int width, int height) { - g2d.drawString("R", 10, 10); + g2d.rotate(-Math.PI / 4, width / 2, height / 2); + g2d.setColor(LEAD_COLOR); + g2d.drawLine(0, height / 2, width, height / 2); + g2d.setColor(BODY_COLOR); + g2d.fillRect(4, height / 2 - 3, width - 8, 6); + g2d.setColor(BORDER_COLOR); + g2d.drawRect(4, height / 2 - 3, width - 8, 6); } @Override @@ -63,7 +69,7 @@ public class Resistor extends AbstractLeadedDIYComponent { } @Override - protected Shape getComponentShape() { + protected Shape getBodyShape() { return new Rectangle2D.Double(0f, 0f, getWidth().convertToPixels(), getHeight() .convertToPixels()); }