From a00028131f7f7575f60bcd54563eca249697aa35 Mon Sep 17 00:00:00 2001 From: bancika Date: Sat, 3 Sep 2011 20:01:09 +0000 Subject: [PATCH] Adjustable solder pad hole size --- .../components/connectivity/SolderPad.java | 17 +++++++++++++++-- .../diylc-swing/library/main.jar | Bin 99877 -> 99959 bytes .../diylc-swing/update.xml | 4 ++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/connectivity/SolderPad.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/connectivity/SolderPad.java index c80cd619..284504f7 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/connectivity/SolderPad.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/connectivity/SolderPad.java @@ -29,6 +29,7 @@ public class SolderPad extends AbstractComponent { private Color color = COLOR; private Point point = new Point(0, 0); private Type type = Type.ROUND; + private Size holeSize = HOLE_SIZE; @Override public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, @@ -36,8 +37,8 @@ public class SolderPad extends AbstractComponent { if (checkPointsClipped(g2d.getClip())) { return; } - int diameter = getClosestOdd((int) size.convertToPixels()); - int holeDiameter = getClosestOdd((int) HOLE_SIZE.convertToPixels()); + int diameter = getClosestOdd((int) getSize().convertToPixels()); + int holeDiameter = getClosestOdd((int) getHoleSize().convertToPixels()); g2d.setColor(componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR : color); if (type == Type.ROUND) { @@ -70,6 +71,18 @@ public class SolderPad extends AbstractComponent { this.size = size; } + @EditableProperty(name = "Hole") + public Size getHoleSize() { + if (holeSize == null) { + holeSize = HOLE_SIZE; + } + return holeSize; + } + + public void setHoleSize(Size holeSize) { + this.holeSize = holeSize; + } + @Override public String getName() { return super.getName(); diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/library/main.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/library/main.jar index 90d9cd1ceaf064fa15de2b3d4a3907ddfb1b66a2..f5439c8b293ddd5a03c8deeaf9375940e7fb9dc4 100644 GIT binary patch delta 4648 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 delta 4331 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 diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml index 3fdef9d7..4b02cd64 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml @@ -394,6 +394,10 @@ IMPROVEMENT Better lead and label rendering when lead spacing is smaller than component body + + NEW_FEATURE + Adjustable solder pad hole size + http://code.google.com/p/diy-layout-creator/downloads/list