BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-13 02:32:09 +10:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the issue of disappearing components in some edge cases

Browse Source
This commit is contained in:
Bane Stojkovic
2026-10-12 15:58:38 +02:00
parent 5f09026ddd
commit 2cab737acf
7 changed files with 100 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-library/src/main/java/org/diylc/components/connectivity/CurvedTrace.java
+5
View File
@@ -68,6 +68,11 @@ public class CurvedTrace extends AbstractCurvedComponent<Void> implements ILayer
return COLOR;
}
@Override
protected double getClipMargin() {
return size.convertToPixels() / 2 + 1;
}
@Override
protected void drawCurve(Path2D curve, Graphics2D g2d, ComponentState componentState, IDrawingObserver drawingObserver) {
float thickness = (float) size.convertToPixels();
diylc/diylc-library/src/main/java/org/diylc/components/connectivity/HookupWire.java
+10 -1
View File
@@ -61,9 +61,18 @@ public class HookupWire extends AbstractCurvedComponent<AWG> implements IContinu
return COLOR;
}
private int getThickness() {
return (int) (gauge.diameterIn() * Constants.PIXELS_PER_INCH * (1 + 2 * INSULATION_THICKNESS_PCT)) - 1;
}
@Override
protected double getClipMargin() {
return getThickness() / 2d + 1;
}
@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;
int thickness = getThickness();
Color curveColor =
componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
: color;
diylc/diylc-library/src/main/java/org/diylc/components/connectivity/OrthogonalLine.java
+6
View File
@@ -78,6 +78,12 @@ public class OrthogonalLine extends AbstractOrthogonalComponent<Void> implements
g2d.draw(createIconPath(width, height));
}
// an arrow head spreads one arrow size to either side of the end point it sits on
@Override
protected double getClipMargin() {
return Math.max(getThickness().convertToPixels() / 2, getArrowSize().convertToPixels()) + 1;
}
@Override
protected void drawCurve(Path2D curve, Graphics2D g2d, ComponentState componentState,
IDrawingObserver drawingObserver) {
diylc/diylc-library/src/main/java/org/diylc/components/connectivity/OrthogonalWire.java
+10 -1
View File
@@ -65,9 +65,18 @@ public class OrthogonalWire extends AbstractOrthogonalComponent<AWG> implements
return COLOR;
}
private int getThickness() {
return (int) (gauge.diameterIn() * Constants.PIXELS_PER_INCH * (1 + 2 * INSULATION_THICKNESS_PCT)) - 1;
}
@Override
protected double getClipMargin() {
return getThickness() / 2d + 1;
}
@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;
int thickness = getThickness();
Color curveColor =
componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
: color;
diylc/diylc-library/src/main/java/org/diylc/components/connectivity/TwistedWire.java
+12 -3
View File
@@ -83,12 +83,21 @@ public class TwistedWire extends AbstractCurvedComponent<Void> implements IConti
return COLOR;
}
private int getThickness() {
return (int) (gauge.diameterIn() * Constants.PIXELS_PER_INCH * (1 + 2 * INSULATION_THICKNESS_PCT))
- 1;
}
// the two leads swing out to either side of the curve as they twist, see recalculate
@Override
protected double getClipMargin() {
return getThickness() * 2 + 1;
}
@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;
int thickness = getThickness();
Color curveColor1 =
componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING
? SELECTION_COLOR