From 6bb248032f65ccede1e9ab28a18b7e74de2a935e Mon Sep 17 00:00:00 2001 From: bancika Date: Sun, 30 Jan 2011 11:32:55 +0000 Subject: [PATCH] added square pad --- .../DIYLC/library/main.jar | Bin 75016 -> 75998 bytes .../DIYLC/update.xml | 4 +++ .../components/connectivity/SolderPad.java | 25 +++++++++++++++++- .../passive/PotentiometerPanel.java | 2 +- 4 files changed, 29 insertions(+), 2 deletions(-) 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 11143583467920c3108c0d496c50af8c5a6fa661..3634937b80b2898145b299129b75f9b5baf7a088 100644 GIT binary patch delta 4921 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 Electrolytic capacitor has a new icon and new looks + + IMPROVEMENT + Solder pad can be square + NEW_FEATURE Added support for creating and loading templates diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/SolderPad.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/SolderPad.java index 11728b3f..e24f3691 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/SolderPad.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/SolderPad.java @@ -28,6 +28,7 @@ public class SolderPad extends AbstractComponent { private Size size = SIZE; private Color color = COLOR; private Point point = new Point(0, 0); + private Type type = Type.ROUND; @Override public void draw(Graphics2D g2d, ComponentState componentState, Project project, @@ -36,7 +37,11 @@ public class SolderPad extends AbstractComponent { int holeDiameter = getClosestOdd(HOLE_SIZE.convertToPixels()); g2d.setColor(componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR : color); - g2d.fillOval(point.x - diameter / 2, point.y - diameter / 2, diameter, diameter); + if (type == Type.ROUND) { + g2d.fillOval(point.x - diameter / 2, point.y - diameter / 2, diameter, diameter); + } else { + g2d.fillRect(point.x - diameter / 2, point.y - diameter / 2, diameter, diameter); + } g2d.setColor(Constants.CANVAS_COLOR); g2d.fillOval(point.x - holeDiameter / 2, point.y - holeDiameter / 2, holeDiameter, holeDiameter); @@ -102,6 +107,15 @@ public class SolderPad extends AbstractComponent { this.color = color; } + @EditableProperty + public Type getType() { + return type; + } + + public void setType(Type type) { + this.type = type; + } + @Deprecated @Override public Void getValue() { @@ -111,4 +125,13 @@ public class SolderPad extends AbstractComponent { @Override public void setValue(Void value) { } + + static enum Type { + ROUND, SQUARE; + + @Override + public String toString() { + return name().substring(0, 1) + name().substring(1).toLowerCase(); + } + } } diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/PotentiometerPanel.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/PotentiometerPanel.java index e07106d2..d8531f4b 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/PotentiometerPanel.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/PotentiometerPanel.java @@ -212,7 +212,7 @@ public class PotentiometerPanel extends AbstractPotentiometer { @Override public void drawIcon(Graphics2D g2d, int width, int height) { int margin = 4 * width / 32; - int spacing = width / 3; + int spacing = width / 3 - 1; g2d.setColor(BORDER_COLOR); g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(2 * width / 32)); g2d.drawLine(width / 2 - spacing, height / 2, width / 2 - spacing, height - margin);