mirror of
https://github.com/bancika/diy-layout-creator
synced 2026-11-07 12:24:58 +10:00
Change Twisted Leads to render consistently
This commit is contained in:
Bane Stojkovic
@@ -31,7 +31,7 @@ import java.awt.geom.Rectangle2D;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import java.util.stream.IntStream;
|
||||
import org.diylc.common.LineStyle;
|
||||
import org.diylc.common.ObjectCache;
|
||||
import org.diylc.components.AbstractCurvedComponent;
|
||||
@@ -45,8 +45,9 @@ import org.diylc.core.annotations.ComponentDescriptor;
|
||||
import org.diylc.core.annotations.EditableProperty;
|
||||
import org.diylc.utils.Constants;
|
||||
|
||||
@ComponentDescriptor(name = "Twisted Leads", author = "Branislav Stojkovic", category = "Connectivity",
|
||||
instanceNamePrefix = "W", description = "A pair of flexible leads twisted tighly together", zOrder = IDIYComponent.WIRING,
|
||||
@ComponentDescriptor(name = "Twisted Leads", author = "Branislav Stojkovic",
|
||||
category = "Connectivity", instanceNamePrefix = "W",
|
||||
description = "A pair of flexible leads twisted tighly together", zOrder = IDIYComponent.WIRING,
|
||||
flexibleZOrder = true, bomPolicy = BomPolicy.NEVER_SHOW, autoEdit = false,
|
||||
transformer = SimpleComponentTransformer.class, enableCache = true)
|
||||
public class TwistedWire extends AbstractCurvedComponent<Void> implements IContinuity {
|
||||
@@ -60,35 +61,40 @@ public class TwistedWire extends AbstractCurvedComponent<Void> implements IConti
|
||||
public static double INSULATION_THICKNESS_PCT = 0.3;
|
||||
|
||||
protected AWG gauge = AWG._22;
|
||||
|
||||
|
||||
private Color color2 = COLOR2;
|
||||
private Color stripeColor = STRIPE_COLOR;
|
||||
private Color stripeColor2 = STRIPE_COLOR2;
|
||||
private boolean stripe1 = false;
|
||||
private boolean stripe2 = false;
|
||||
|
||||
|
||||
// cached areas
|
||||
transient private Area firstLeadArea = null;
|
||||
transient private Area secondLeadArea = null;
|
||||
|
||||
|
||||
transient private Area firstLeadStripeArea = null;
|
||||
transient private Area secondLeadStripeArea = null;
|
||||
|
||||
@Override
|
||||
protected Color getDefaultColor() {
|
||||
return COLOR;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void drawCurve(Path2D curve, Graphics2D g2d, ComponentState componentState, IDrawingObserver drawingObserver) {
|
||||
int thickness = (int) (gauge.diameterIn() * Constants.PIXELS_PER_INCH * (1 + 2 * INSULATION_THICKNESS_PCT)) - 1;
|
||||
protected void drawCurve(Path2D curve, Graphics2D g2d, ComponentState componentState,
|
||||
IDrawingObserver drawingObserver) {
|
||||
int thickness =
|
||||
(int) (gauge.diameterIn() * Constants.PIXELS_PER_INCH * (1 + 2 * INSULATION_THICKNESS_PCT))
|
||||
- 1;
|
||||
Color curveColor1 =
|
||||
componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
|
||||
componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING
|
||||
? SELECTION_COLOR
|
||||
: color;
|
||||
Color curveColor2 =
|
||||
componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
|
||||
componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING
|
||||
? SELECTION_COLOR
|
||||
: color2;
|
||||
|
||||
|
||||
if (firstLeadArea == null || secondLeadArea == null) {
|
||||
firstLeadArea = new Area();
|
||||
secondLeadArea = new Area();
|
||||
@@ -102,29 +108,29 @@ public class TwistedWire extends AbstractCurvedComponent<Void> implements IConti
|
||||
secondLeadStripeArea.intersect(secondLeadArea);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
g2d.setColor(curveColor1);
|
||||
drawingObserver.startTracking();
|
||||
g2d.fill(firstLeadArea);
|
||||
drawingObserver.stopTracking();
|
||||
|
||||
|
||||
if (stripe1 && componentState == ComponentState.NORMAL) {
|
||||
drawingObserver.stopTracking();
|
||||
g2d.setColor(stripeColor);
|
||||
g2d.fill(firstLeadStripeArea);
|
||||
g2d.fill(firstLeadStripeArea);
|
||||
}
|
||||
|
||||
|
||||
g2d.setColor(curveColor2);
|
||||
drawingObserver.startTracking();
|
||||
g2d.fill(secondLeadArea);
|
||||
drawingObserver.stopTracking();
|
||||
|
||||
if (stripe2 && componentState == ComponentState.NORMAL) {
|
||||
|
||||
if (stripe2 && componentState == ComponentState.NORMAL) {
|
||||
g2d.setColor(stripeColor2);
|
||||
g2d.fill(secondLeadStripeArea);
|
||||
g2d.fill(secondLeadStripeArea);
|
||||
}
|
||||
|
||||
if (componentState == ComponentState.NORMAL) {
|
||||
|
||||
if (componentState == ComponentState.NORMAL) {
|
||||
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1f));
|
||||
g2d.setColor(color.darker());
|
||||
g2d.draw(firstLeadArea);
|
||||
@@ -132,24 +138,26 @@ public class TwistedWire extends AbstractCurvedComponent<Void> implements IConti
|
||||
g2d.draw(secondLeadArea);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void drawIcon(Graphics2D g2d, int width, int height) {
|
||||
public void drawIcon(Graphics2D g2d, int width, int height) {
|
||||
Stroke stroke = ObjectCache.getInstance().fetchBasicStroke(3);
|
||||
CubicCurve2D curve1 = new CubicCurve2D.Double(2, height - 2, width - 4, height - 4, 4, 4, width - 2, 2);
|
||||
CubicCurve2D curve2 = new CubicCurve2D.Double(2, height - 2, 4, 4, width - 4, height - 4, width - 2, 2);
|
||||
|
||||
CubicCurve2D curve1 =
|
||||
new CubicCurve2D.Double(2, height - 2, width - 4, height - 4, 4, 4, width - 2, 2);
|
||||
CubicCurve2D curve2 =
|
||||
new CubicCurve2D.Double(2, height - 2, 4, 4, width - 4, height - 4, width - 2, 2);
|
||||
|
||||
Area area1 = new Area(stroke.createStrokedShape(curve1));
|
||||
Area area2 = new Area(stroke.createStrokedShape(curve2));
|
||||
area2.subtract(area1);
|
||||
|
||||
g2d.setColor(COLOR2);
|
||||
|
||||
g2d.setColor(COLOR2);
|
||||
g2d.fill(area2);
|
||||
g2d.setColor(COLOR);
|
||||
g2d.fill(area1);
|
||||
|
||||
|
||||
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
|
||||
g2d.setColor(COLOR2.darker());
|
||||
g2d.setColor(COLOR2.darker());
|
||||
g2d.draw(area2);
|
||||
g2d.setColor(COLOR.darker());
|
||||
g2d.draw(area1);
|
||||
@@ -162,29 +170,29 @@ public class TwistedWire extends AbstractCurvedComponent<Void> implements IConti
|
||||
|
||||
public void setGauge(AWG gauge) {
|
||||
this.gauge = gauge;
|
||||
|
||||
|
||||
// invalidate cached areas
|
||||
this.firstLeadArea = null;
|
||||
this.secondLeadArea = null;
|
||||
this.firstLeadStripeArea = null;
|
||||
this.secondLeadStripeArea = null;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void setControlPoint(Point2D point, int index) {
|
||||
public void setControlPoint(Point2D point, int index) {
|
||||
super.setControlPoint(point, index);
|
||||
|
||||
|
||||
// invalidate cached areas
|
||||
this.firstLeadArea = null;
|
||||
this.secondLeadArea = null;
|
||||
this.firstLeadStripeArea = null;
|
||||
this.secondLeadStripeArea = null;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void setPointCount(PointCount pointCount) {
|
||||
super.setPointCount(pointCount);
|
||||
|
||||
|
||||
// invalidate cached areas
|
||||
this.firstLeadArea = null;
|
||||
this.secondLeadArea = null;
|
||||
@@ -198,28 +206,28 @@ public class TwistedWire extends AbstractCurvedComponent<Void> implements IConti
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setValue(Void value) {}
|
||||
|
||||
public void setValue(Void value) {}
|
||||
|
||||
@EditableProperty(name = "Color 1")
|
||||
public Color getLeadColor() {
|
||||
return color;
|
||||
}
|
||||
|
||||
|
||||
@EditableProperty(name = "Color 2")
|
||||
public Color getColor2() {
|
||||
return color2;
|
||||
}
|
||||
|
||||
|
||||
public void setColor2(Color color2) {
|
||||
this.color2 = color2;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public LineStyle getStyle() {
|
||||
// prevent from editing
|
||||
return super.getStyle();
|
||||
}
|
||||
|
||||
|
||||
@EditableProperty(name = "Stripe Color 1")
|
||||
public Color getStripeColor() {
|
||||
return stripeColor;
|
||||
@@ -237,7 +245,7 @@ public class TwistedWire extends AbstractCurvedComponent<Void> implements IConti
|
||||
public void setStripeColor2(Color stripeColor2) {
|
||||
this.stripeColor2 = stripeColor2;
|
||||
}
|
||||
|
||||
|
||||
@EditableProperty(name = "Stripe 1")
|
||||
public boolean getStripe1() {
|
||||
return stripe1;
|
||||
@@ -245,7 +253,7 @@ public class TwistedWire extends AbstractCurvedComponent<Void> implements IConti
|
||||
|
||||
public void setStripe1(boolean stripe1) {
|
||||
this.stripe1 = stripe1;
|
||||
|
||||
|
||||
if (stripe1) {
|
||||
// invalidate cached areas
|
||||
this.firstLeadArea = null;
|
||||
@@ -262,7 +270,7 @@ public class TwistedWire extends AbstractCurvedComponent<Void> implements IConti
|
||||
|
||||
public void setStripe2(boolean stripe2) {
|
||||
this.stripe2 = stripe2;
|
||||
|
||||
|
||||
if (stripe2) {
|
||||
// invalidate cached areas
|
||||
this.firstLeadArea = null;
|
||||
@@ -271,10 +279,11 @@ public class TwistedWire extends AbstractCurvedComponent<Void> implements IConti
|
||||
this.secondLeadStripeArea = null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// hard-core math below :)
|
||||
|
||||
public void recalculate(Path2D path, float thickness, Area firstLeadArea, Area secondLeadArea, boolean stripe) {
|
||||
public void recalculate(Path2D path, float thickness, Area firstLeadArea, Area secondLeadArea,
|
||||
boolean stripe) {
|
||||
PathIterator iterator = path.getPathIterator(null);
|
||||
float[] coords = new float[6];
|
||||
Point2D current = new Point2D.Double();
|
||||
@@ -288,29 +297,31 @@ public class TwistedWire extends AbstractCurvedComponent<Void> implements IConti
|
||||
current.setLocation(coords[0], coords[1]);
|
||||
break;
|
||||
case PathIterator.SEG_LINETO:
|
||||
curves.add(new CubicCurve2D.Double(current.getX(), current.getY(), (current.getX() + coords[0]) / 2,
|
||||
(current.getY() + coords[1]) / 2, (current.getX() + coords[0]) / 2, (current.getY() + coords[1]) / 2, coords[0],
|
||||
curves.add(new CubicCurve2D.Double(current.getX(), current.getY(),
|
||||
(current.getX() + coords[0]) / 2, (current.getY() + coords[1]) / 2,
|
||||
(current.getX() + coords[0]) / 2, (current.getY() + coords[1]) / 2, coords[0],
|
||||
coords[1]));
|
||||
current.setLocation(coords[0], coords[1]);
|
||||
break;
|
||||
case PathIterator.SEG_QUADTO:
|
||||
curves.add(new CubicCurve2D.Double(current.getX(), current.getY(), coords[0], coords[1], coords[0], coords[1],
|
||||
coords[2], coords[3]));
|
||||
curves.add(new CubicCurve2D.Double(current.getX(), current.getY(), coords[0], coords[1],
|
||||
coords[0], coords[1], coords[2], coords[3]));
|
||||
current.setLocation(coords[2], coords[3]);
|
||||
break;
|
||||
case PathIterator.SEG_CUBICTO:
|
||||
curves.add(new CubicCurve2D.Double(current.getX(), current.getY(), coords[0], coords[1], coords[2], coords[3],
|
||||
coords[4], coords[5]));
|
||||
curves.add(new CubicCurve2D.Double(current.getX(), current.getY(), coords[0], coords[1],
|
||||
coords[2], coords[3], coords[4], coords[5]));
|
||||
current.setLocation(coords[4], coords[5]);
|
||||
break;
|
||||
}
|
||||
iterator.next();
|
||||
}
|
||||
|
||||
|
||||
Stroke stroke;
|
||||
|
||||
|
||||
if (stripe)
|
||||
stroke = ObjectCache.getInstance().fetchStroke(thickness, new float[] { thickness / 2, thickness * 2 }, thickness * 10, BasicStroke.CAP_BUTT);
|
||||
stroke = ObjectCache.getInstance().fetchStroke(thickness,
|
||||
new float[] {thickness / 2, thickness * 2}, thickness * 10, BasicStroke.CAP_BUTT);
|
||||
else
|
||||
stroke = ObjectCache.getInstance().fetchBasicStroke(thickness);
|
||||
|
||||
@@ -320,7 +331,7 @@ public class TwistedWire extends AbstractCurvedComponent<Void> implements IConti
|
||||
List<Line2D> polygon = new ArrayList<Line2D>();
|
||||
for (CubicCurve2D curve : curves)
|
||||
polygon.addAll(split(curve, segmentLength));
|
||||
|
||||
|
||||
List<List<Path2D>> segments = new ArrayList<List<Path2D>>();
|
||||
segments.add(new ArrayList<Path2D>());
|
||||
segments.add(new ArrayList<Path2D>());
|
||||
@@ -328,26 +339,25 @@ public class TwistedWire extends AbstractCurvedComponent<Void> implements IConti
|
||||
Path2D[] currentPaths = new Path2D[2];
|
||||
currentPaths[0] = new Path2D.Double();
|
||||
currentPaths[1] = new Path2D.Double();
|
||||
|
||||
|
||||
double offset = thickness * 1.5; // chosen empirically
|
||||
double rectSize = thickness * 3.5; // chosen empirically
|
||||
|
||||
currentPaths[0].moveTo(polygon.get(0).getX1(), polygon.get(0).getY1());
|
||||
currentPaths[1].moveTo(polygon.get(0).getX1(), polygon.get(0).getY1());
|
||||
|
||||
// create curved paths for each segment of the twisted pair
|
||||
for (int i = 0; i < polygon.size(); i++) {
|
||||
// create curved paths for each segment of the twisted pair
|
||||
Line2D line = polygon.get(i);
|
||||
double centerX = (line.getX1() + line.getX2()) / 2;
|
||||
double centerY = (line.getY1() + line.getY2()) / 2;
|
||||
double theta = Math.atan2(line.getY2() - line.getY1(), line.getX2() - line.getX1());
|
||||
|
||||
|
||||
double sign = i % 2 == 0 ? 1 : -1;
|
||||
double[] thetas = new double[] { theta - sign * Math.PI / 2, theta + sign * Math.PI / 2};
|
||||
double[] thetas = new double[] {theta - sign * Math.PI / 2, theta + sign * Math.PI / 2};
|
||||
|
||||
final int finalI = i;
|
||||
|
||||
int finalI = i;
|
||||
|
||||
// calculate curve segments in parallel
|
||||
Arrays.stream(new Integer[] { 0, 1 }).parallel().forEach((j) -> {
|
||||
currentPaths[j].quadTo(centerX + offset * Math.cos(thetas[j]),
|
||||
centerY + offset * Math.sin(thetas[j]), line.getX2(), line.getY2());
|
||||
@@ -358,51 +368,56 @@ public class TwistedWire extends AbstractCurvedComponent<Void> implements IConti
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Area[] outputAreas = new Area[] { new Area(), new Area() };
|
||||
|
||||
|
||||
Area[] outputAreas = new Area[] {new Area(), new Area()};
|
||||
|
||||
// create stroked areas in parallel
|
||||
Arrays.stream(new Integer[] { 0, 1 }).parallel().forEach((j) -> {
|
||||
Arrays.stream(new Integer[] {0, 1}).parallel().forEach((j) -> {
|
||||
for (Path2D p : segments.get(j)) {
|
||||
outputAreas[j].add(new Area(stroke.createStrokedShape(p)));
|
||||
}
|
||||
});
|
||||
|
||||
// at overlapping points, decide which lead goes on top and clear the overlapping area from the lead below
|
||||
Integer[] idx = new Integer[polygon.size()];
|
||||
for (int i = 0; i < polygon.size(); i++) {
|
||||
idx[i] = i;
|
||||
int threadCount = 1;
|
||||
while (threadCount * 4 < polygon.size() && threadCount <= 8) {
|
||||
threadCount++;
|
||||
}
|
||||
|
||||
Arrays.stream(idx).parallel().forEach(i -> {
|
||||
Line2D line = polygon.get(i);
|
||||
Area pointRect1 = new Area(new Rectangle2D.Double(line.getX1() - rectSize / 2,
|
||||
line.getY1() - rectSize / 2, rectSize, rectSize));
|
||||
int chunkSize = polygon.size() / threadCount;
|
||||
|
||||
if (i % 2 == 1) {
|
||||
pointRect1.intersect(outputAreas[0]);
|
||||
synchronized (outputAreas[1]) {
|
||||
outputAreas[1].subtract(pointRect1);
|
||||
}
|
||||
} else {
|
||||
pointRect1.intersect(outputAreas[1]);
|
||||
synchronized (outputAreas[0]) {
|
||||
outputAreas[0].subtract(pointRect1);
|
||||
}
|
||||
}
|
||||
// at overlapping points, decide which lead goes on top and clear the overlapping area from the
|
||||
// lead below
|
||||
IntStream.range(0, threadCount).parallel().forEach(threadIdx -> {
|
||||
for (int i = threadIdx * chunkSize; i < (threadIdx + 1) * chunkSize
|
||||
&& i < polygon.size(); i++) {
|
||||
Line2D line = polygon.get(i);
|
||||
Area pointRect1 = new Area(new Rectangle2D.Double(line.getX1() - rectSize / 2,
|
||||
line.getY1() - rectSize / 2, rectSize, rectSize));
|
||||
|
||||
if (i == polygon.size() - 1) {
|
||||
Area pointRect2 = new Area(new Rectangle2D.Double(line.getX2() - rectSize / 2,
|
||||
line.getY2() - rectSize / 2, rectSize, rectSize));
|
||||
if (i % 2 == 0) {
|
||||
pointRect2.intersect(outputAreas[0]);
|
||||
if (i % 2 == 1) {
|
||||
pointRect1.intersect(outputAreas[0]);
|
||||
synchronized (outputAreas[1]) {
|
||||
outputAreas[1].subtract(pointRect2);
|
||||
outputAreas[1].subtract(pointRect1);
|
||||
}
|
||||
} else {
|
||||
pointRect2.intersect(outputAreas[1]);
|
||||
pointRect1.intersect(outputAreas[1]);
|
||||
synchronized (outputAreas[0]) {
|
||||
outputAreas[0].subtract(pointRect2);
|
||||
outputAreas[0].subtract(pointRect1);
|
||||
}
|
||||
}
|
||||
|
||||
if (i == polygon.size() - 1) {
|
||||
Area pointRect2 = new Area(new Rectangle2D.Double(line.getX2() - rectSize / 2,
|
||||
line.getY2() - rectSize / 2, rectSize, rectSize));
|
||||
if (i % 2 == 0) {
|
||||
pointRect2.intersect(outputAreas[0]);
|
||||
synchronized (outputAreas[1]) {
|
||||
outputAreas[1].subtract(pointRect2);
|
||||
}
|
||||
} else {
|
||||
pointRect2.intersect(outputAreas[1]);
|
||||
synchronized (outputAreas[0]) {
|
||||
outputAreas[0].subtract(pointRect2);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -418,12 +433,12 @@ public class TwistedWire extends AbstractCurvedComponent<Void> implements IConti
|
||||
Point2D p1 = curve.getP1();
|
||||
Point2D p2 = curve.getP2();
|
||||
List<Line2D> res = new ArrayList<Line2D>();
|
||||
|
||||
|
||||
double length = Double.MAX_VALUE;
|
||||
|
||||
|
||||
if (p1.distance(p2) <= segmentLength)
|
||||
length = calculateLength(curve, segmentLength / 10);
|
||||
|
||||
|
||||
if (length <= segmentLength) {
|
||||
res.add(new Line2D.Double(p1, p2));
|
||||
} else {
|
||||
@@ -435,26 +450,26 @@ public class TwistedWire extends AbstractCurvedComponent<Void> implements IConti
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
// calculates length of a curve, given the precision
|
||||
private double calculateLength(CubicCurve2D curve, double precision) {
|
||||
Point2D p1 = curve.getP1();
|
||||
Point2D p2 = curve.getP2();
|
||||
|
||||
double d = p1.distance(p2);
|
||||
|
||||
double d = p1.distance(p2);
|
||||
if (d <= precision) {
|
||||
return d;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
CubicCurve2D left = new CubicCurve2D.Double();
|
||||
CubicCurve2D right = new CubicCurve2D.Double();
|
||||
curve.subdivide(left, right);
|
||||
|
||||
|
||||
return calculateLength(left, precision) + calculateLength(right, precision);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean arePointsConnected(int index1, int index2) {
|
||||
return Math.abs(index1 - index2) == getControlPointCount() - 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user