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 c152b603..8c356a55 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/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 5368f77c..a13b7838 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 @@ -11,6 +11,7 @@ import org.diylc.core.ComponentState; import org.diylc.core.IDIYComponent; import org.diylc.core.Project; import org.diylc.core.annotations.ComponentDescriptor; +import org.diylc.core.annotations.EditableProperty; import org.diylc.core.measures.Size; import org.diylc.core.measures.SizeUnit; import org.diylc.utils.Constants; @@ -29,6 +30,7 @@ public class PerfBoard extends AbstractBoard { private static Size HOLE_SIZE = new Size(0.8d, SizeUnit.mm); // private Area copperArea; + private Size spacing = SPACING; @Override public void draw(Graphics2D g2d, ComponentState componentState, Project project) { @@ -55,11 +57,11 @@ public class PerfBoard extends AbstractBoard { int holeRadius = HOLE_SIZE.convertToPixels() / 2; g2d.setStroke(new BasicStroke(radius)); - while (p.y < controlPoints[1].y - SPACING.convertToPixels()) { + while (p.y < controlPoints[1].y - spacing.convertToPixels()) { p.x = controlPoints[0].x; - p.y += SPACING.convertToPixels(); - while (p.x < controlPoints[1].x - SPACING.convertToPixels()) { - p.x += SPACING.convertToPixels(); + p.y += spacing.convertToPixels(); + while (p.x < controlPoints[1].x - spacing.convertToPixels()) { + p.x += spacing.convertToPixels(); g2d.setColor(COPPER_COLOR); g2d.fillOval(p.x - radius, p.y - radius, radius * 2, radius * 2); g2d.setColor(Constants.CANVAS_COLOR); @@ -124,6 +126,15 @@ public class PerfBoard extends AbstractBoard { // return copperArea; // } + @EditableProperty + public Size getSpacing() { + return spacing; + } + + public void setSpacing(Size spacing) { + this.spacing = spacing; + } + @Override protected Color getBoardColor() { return BOARD_COLOR; 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 2d0aa3a9..689e6372 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 @@ -10,6 +10,7 @@ import org.diylc.core.ComponentState; import org.diylc.core.IDIYComponent; import org.diylc.core.Project; import org.diylc.core.annotations.ComponentDescriptor; +import org.diylc.core.annotations.EditableProperty; import org.diylc.core.measures.Size; import org.diylc.core.measures.SizeUnit; import org.diylc.utils.Constants; @@ -28,6 +29,7 @@ public class VeroBoard extends AbstractBoard { private static Size HOLE_SIZE = new Size(0.8d, SizeUnit.mm); // private Area copperArea; + private Size spacing = SPACING; @Override public void draw(Graphics2D g2d, ComponentState componentState, Project project) { @@ -53,14 +55,14 @@ public class VeroBoard extends AbstractBoard { int stripSize = STRIP_SIZE.convertToPixels() / 2 * 2; int holeRadius = HOLE_SIZE.convertToPixels() / 2; - while (p.y < controlPoints[1].y - SPACING.convertToPixels()) { + while (p.y < controlPoints[1].y - spacing.convertToPixels()) { p.x = controlPoints[0].x; - p.y += SPACING.convertToPixels(); + p.y += spacing.convertToPixels(); g2d.setColor(COPPER_COLOR); g2d.fillRect(p.x + SPACING.convertToPixels() / 2, p.y - stripSize / 2, - controlPoints[1].x - SPACING.convertToPixels() - p.x, stripSize); - while (p.x < controlPoints[1].x - SPACING.convertToPixels()) { - p.x += SPACING.convertToPixels(); + controlPoints[1].x - spacing.convertToPixels() - p.x, stripSize); + while (p.x < controlPoints[1].x - spacing.convertToPixels()) { + p.x += spacing.convertToPixels(); g2d.setColor(Constants.CANVAS_COLOR); g2d .fillOval(p.x - holeRadius, p.y - holeRadius, holeRadius * 2, @@ -122,6 +124,15 @@ public class VeroBoard extends AbstractBoard { // } // return copperArea; // } + + @EditableProperty + public Size getSpacing() { + return spacing; + } + + public void setSpacing(Size spacing) { + this.spacing = spacing; + } @Override protected Color getBoardColor() {