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 0058310b..78d41e60 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 9d0b8644..2e9e36d1 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 @@ -20,27 +20,18 @@ public class PerfBoard extends AbstractBoard { private static final long serialVersionUID = 1L; - public static Color COPPER_COLOR = Color.decode("#B87333"); + public static Color PAD_COLOR = Color.decode("#B87333"); - private static Size SPACING = new Size(0.1d, SizeUnit.in); - private static Size PAD_SIZE = new Size(0.08d, SizeUnit.in); - private static Size HOLE_SIZE = new Size(0.7d, SizeUnit.mm); + public static Size SPACING = new Size(0.1d, SizeUnit.in); + public static Size PAD_SIZE = new Size(0.08d, SizeUnit.in); + public static Size HOLE_SIZE = new Size(0.7d, SizeUnit.mm); // private Area copperArea; - private Size spacing = SPACING; + protected Size spacing = SPACING; + protected Color padColor = PAD_COLOR; @Override public void draw(Graphics2D g2d, ComponentState componentState, Project project) { - // long t = System.nanoTime(); - // Area copperArea = getCopperArea(); - // System.err.println("Calc: " + (System.nanoTime() - t)); - // t = System.nanoTime(); - // super.draw(g2d, componentState, project); - // g2d.setColor(COPPER_COLOR); - // g2d.fill(copperArea); - // System.err.println(" Draw: " + (System.nanoTime() - t)); - - // long t = System.nanoTime(); super.draw(g2d, componentState, project); if (componentState != ComponentState.DRAGGING) { @@ -59,7 +50,7 @@ public class PerfBoard extends AbstractBoard { p.y += spacing; while (p.x < controlPoints[1].x - spacing) { p.x += spacing; - g2d.setColor(COPPER_COLOR); + g2d.setColor(padColor); g2d.fillOval(p.x - diameter / 2, p.y - diameter / 2, diameter, diameter); g2d.setColor(Constants.CANVAS_COLOR); g2d.fillOval(p.x - holeDiameter / 2, p.y - holeDiameter / 2, holeDiameter, @@ -68,59 +59,16 @@ public class PerfBoard extends AbstractBoard { } g2d.setComposite(oldComposite); } - // System.err.println("OldDraw: " + (System.nanoTime() - t)); } - // @Override - // public void setControlPoint(Point point, int index) { - // // Reset copper area if a control point is changed. - // if (!point.equals(getControlPoint(index))) { - // copperArea = null; - // } - // super.setControlPoint(point, index); - // } - // - // public Area getCopperArea() { - // if (copperArea == null) { - // copperArea = new Area(); - // - // int holeRadius = HOLE_SIZE.convertToPixels() / 2; - // int radius = PAD_SIZE.convertToPixels() / 2; - // int spacing = SPACING.convertToPixels(); - // - // // Create a pad. - // Area pad = new Area(new Ellipse2D.Double(-radius, -radius, radius * 2, - // radius * 2)); - // pad.subtract(new Area(new Ellipse2D.Double(-holeRadius, -holeRadius, - // holeRadius * 2, - // holeRadius * 2))); - // - // // Create a row duplicating the pad. - // Area row = new Area(); - // int columnCount = (controlPoints[1].x - controlPoints[0].x) / spacing - - // 1; - // int rowCount = (controlPoints[1].y - controlPoints[0].y) / spacing - 1; - // - // AffineTransform xTransform = - // AffineTransform.getTranslateInstance(spacing, 0); - // for (int i = 0; i < columnCount; i++) { - // pad.transform(xTransform); - // row.add(pad); - // } - // - // // Create the whole matrix duplicating the row. - // AffineTransform yTransform = AffineTransform.getTranslateInstance(0, - // spacing); - // for (int i = 0; i < rowCount; i++) { - // row.transform(yTransform); - // copperArea.add(row); - // } - // - // copperArea.transform(AffineTransform.getTranslateInstance(controlPoints[0].x, - // controlPoints[0].y)); - // } - // return copperArea; - // } + @EditableProperty(name = "Pad") + public Color getPadColor() { + return padColor; + } + + public void setPadColor(Color padColor) { + this.padColor = padColor; + } @EditableProperty public Size getSpacing() { @@ -137,7 +85,7 @@ public class PerfBoard extends AbstractBoard { 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.setColor(PAD_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 554574fd..05ad8bca 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 @@ -21,28 +21,18 @@ public class VeroBoard extends AbstractBoard { private static final long serialVersionUID = 1L; public static Color BOARD_COLOR = Color.decode("#BCED91"); - public static Color COPPER_COLOR = Color.decode("#B87333"); + public static Color PAD_COLOR = Color.decode("#B87333"); public static Color BORDER_COLOR = BOARD_COLOR.darker(); - private static Size SPACING = new Size(0.1d, SizeUnit.in); - private static Size STRIP_SIZE = new Size(0.085d, SizeUnit.in); - private static Size HOLE_SIZE = new Size(0.7d, SizeUnit.mm); + public static Size SPACING = new Size(0.1d, SizeUnit.in); + public static Size STRIP_SIZE = new Size(0.085d, SizeUnit.in); + public static Size HOLE_SIZE = new Size(0.7d, SizeUnit.mm); - // private Area copperArea; - private Size spacing = SPACING; + protected Size spacing = SPACING; + protected Color padColor = PAD_COLOR; @Override public void draw(Graphics2D g2d, ComponentState componentState, Project project) { - // long t = System.nanoTime(); - // Area copperArea = getCopperArea(); - // System.err.println("Calc: " + (System.nanoTime() - t)); - // t = System.nanoTime(); - // super.draw(g2d, componentState, project); - // g2d.setColor(COPPER_COLOR); - // g2d.fill(copperArea); - // System.err.println(" Draw: " + (System.nanoTime() - t)); - - // long t = System.nanoTime(); super.draw(g2d, componentState, project); if (componentState != ComponentState.DRAGGING) { @@ -59,7 +49,7 @@ public class VeroBoard extends AbstractBoard { while (p.y < controlPoints[1].y - spacing) { p.x = controlPoints[0].x; p.y += spacing; - g2d.setColor(COPPER_COLOR); + g2d.setColor(padColor); g2d.fillRect(p.x + SPACING.convertToPixels() / 2, p.y - stripSize / 2, controlPoints[1].x - spacing - p.x, stripSize); while (p.x < controlPoints[1].x - spacing) { @@ -72,65 +62,22 @@ public class VeroBoard extends AbstractBoard { } g2d.setComposite(oldComposite); } - // System.err.println("OldDraw: " + (System.nanoTime() - t)); } - // @Override - // public void setControlPoint(Point point, int index) { - // // Reset copper area if a control point is changed. - // if (!point.equals(getControlPoint(index))) { - // copperArea = null; - // } - // super.setControlPoint(point, index); - // } - // - // public Area getCopperArea() { - // if (copperArea == null) { - // copperArea = new Area(); - // - // int holeRadius = HOLE_SIZE.convertToPixels() / 2; - // int radius = PAD_SIZE.convertToPixels() / 2; - // int spacing = SPACING.convertToPixels(); - // - // // Create a pad. - // Area pad = new Area(new Ellipse2D.Double(-radius, -radius, radius * 2, - // radius * 2)); - // pad.subtract(new Area(new Ellipse2D.Double(-holeRadius, -holeRadius, - // holeRadius * 2, - // holeRadius * 2))); - // - // // Create a row duplicating the pad. - // Area row = new Area(); - // int columnCount = (controlPoints[1].x - controlPoints[0].x) / spacing - - // 1; - // int rowCount = (controlPoints[1].y - controlPoints[0].y) / spacing - 1; - // - // AffineTransform xTransform = - // AffineTransform.getTranslateInstance(spacing, 0); - // for (int i = 0; i < columnCount; i++) { - // pad.transform(xTransform); - // row.add(pad); - // } - // - // // Create the whole matrix duplicating the row. - // AffineTransform yTransform = AffineTransform.getTranslateInstance(0, - // spacing); - // for (int i = 0; i < rowCount; i++) { - // row.transform(yTransform); - // copperArea.add(row); - // } - // - // copperArea.transform(AffineTransform.getTranslateInstance(controlPoints[0].x, - // controlPoints[0].y)); - // } - // return copperArea; - // } - + @EditableProperty(name = "Pad") + public Color getPadColor() { + return padColor; + } + + public void setPadColor(Color padColor) { + this.padColor = padColor; + } + @EditableProperty public Size getSpacing() { return spacing; } - + public void setSpacing(Size spacing) { this.spacing = spacing; } @@ -141,7 +88,7 @@ public class VeroBoard extends AbstractBoard { 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.setColor(PAD_COLOR); g2d.fillRect(4, width / 4, width - 8, width / 2); g2d.setColor(Constants.CANVAS_COLOR); g2d.fillOval(width / 3 - 1, width / 2 - 1, 3, 3);