From 41bcfec45e0a519b7ed9364501d856a7d072ec52 Mon Sep 17 00:00:00 2001 From: bancika Date: Sun, 9 Jan 2011 12:44:07 +0000 Subject: [PATCH] added some icons --- .../Library/lib/diylc.jar | Bin 233255 -> 234073 bytes .../diylc/components/boards/BlankBoard.java | 7 +++++-- .../diylc/components/boards/PerfBoard.java | 9 ++++++++- .../diylc/components/boards/VeroBoard.java | 12 ++++++++++-- .../components/interconnects/HookupWire.java | 8 ++++---- .../components/interconnects/Jumper.java | 2 +- .../diylc/components/interconnects/Trace.java | 2 +- .../passive/AxialFilmCapacitor.java | 10 ++++++++-- .../passive/RadialCeramicDiskCapacitor.java | 10 ++++++++-- .../passive/RadialFilmCapacitor.java | 10 ++++++++-- .../diylc/components/passive/Resistor.java | 10 ++++++++-- 11 files changed, 61 insertions(+), 19 deletions(-) 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 9a0a74028894efd8a690cae8e95fa647743edf16..c957a869f2c56575d7b8d8f6b11380a5ca77727e 100644 GIT binary patch delta 27032 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 z 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 Cz7SOa 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()); }