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

Split trace layer

Browse Source
This commit is contained in:
Bane Stojkovic
2026-11-12 13:42:04 +01:00
parent 4aab04f751
commit 6e3f72dfb6
26 changed files with 684 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-library/src/main/java/org/diylc/components/connectivity/Eyelet.java
+9 -1
View File
@@ -33,6 +33,7 @@ import org.diylc.core.ComponentState;
import org.diylc.core.IConnective;
import org.diylc.core.IDIYComponent;
import org.diylc.core.IDrawingObserver;
import org.diylc.core.ILayeredComponent;
import org.diylc.core.Project;
import org.diylc.core.VisibilityPolicy;
import org.diylc.core.annotations.AiNote;
@@ -52,7 +53,8 @@ import org.diylc.utils.Constants;
zOrder = IDIYComponent.TRACE + 0.1, bomPolicy = BomPolicy.SHOW_ONLY_TYPE_NAME, autoEdit = false,
keywordPolicy = KeywordPolicy.SHOW_TYPE_NAME, transformer = SimpleComponentTransformer.class,
enableCache = true)
public class Eyelet extends AbstractTransparentComponent<String> implements IConnective {
public class Eyelet extends AbstractTransparentComponent<String>
implements IConnective, ILayeredComponent {
private static final long serialVersionUID = 1L;
@@ -132,6 +134,12 @@ public class Eyelet extends AbstractTransparentComponent<String> implements ICon
return super.getName();
}
// goes through the board, so it is on every copper layer
@Override
public int getLayerId() {
return 0;
}
@Override
public int getControlPointCount() {
return 1;
diylc/diylc-library/src/main/java/org/diylc/components/connectivity/Turret.java
+9 -1
View File
@@ -33,6 +33,7 @@ import org.diylc.core.ComponentState;
import org.diylc.core.IConnective;
import org.diylc.core.IDIYComponent;
import org.diylc.core.IDrawingObserver;
import org.diylc.core.ILayeredComponent;
import org.diylc.core.Project;
import org.diylc.core.VisibilityPolicy;
import org.diylc.core.annotations.AiNote;
@@ -50,7 +51,8 @@ import org.diylc.utils.Constants;
zOrder = IDIYComponent.TRACE + 0.1, bomPolicy = BomPolicy.SHOW_ONLY_TYPE_NAME, autoEdit = false,
keywordPolicy = KeywordPolicy.SHOW_TYPE_NAME, transformer = SimpleComponentTransformer.class,
enableCache = true)
public class Turret extends AbstractTransparentComponent<String> implements IConnective {
public class Turret extends AbstractTransparentComponent<String>
implements IConnective, ILayeredComponent {
private static final long serialVersionUID = 1L;
@@ -127,6 +129,12 @@ public class Turret extends AbstractTransparentComponent<String> implements ICon
return super.getName();
}
// goes through the board, so it is on every copper layer
@Override
public int getLayerId() {
return 0;
}
@Override
public int getControlPointCount() {
return 1;
diylc/diylc-library/src/main/java/org/diylc/components/connectivity/Via.java
+8 -1
View File
@@ -36,6 +36,7 @@ import org.diylc.core.ComponentState;
import org.diylc.core.IConnective;
import org.diylc.core.IDIYComponent;
import org.diylc.core.IDrawingObserver;
import org.diylc.core.ILayeredComponent;
import org.diylc.core.Project;
import org.diylc.core.VisibilityPolicy;
import org.diylc.core.annotations.AiNote;
@@ -62,7 +63,7 @@ import org.diylc.utils.Constants;
bomPolicy = BomPolicy.NEVER_SHOW, keywordPolicy = KeywordPolicy.SHOW_TAG, keywordTag = "PCB",
transformer = SimpleComponentTransformer.class, enableCache = true)
public class Via extends AbstractTransparentComponent<Void>
implements IConnective, IGerberComponentCustom {
implements IConnective, ILayeredComponent, IGerberComponentCustom {
private static final long serialVersionUID = 1L;
@@ -175,6 +176,12 @@ public class Via extends AbstractTransparentComponent<Void>
this.color = color;
}
// goes through the board, so it is on every copper layer
@Override
public int getLayerId() {
return 0;
}
@Override
public int getControlPointCount() {
return 1;
diylc/diylc-library/src/test/java/org/diylc/presenter/ComponentLayersTest.java
+142
View File
@@ -0,0 +1,142 @@
/*
DIY Layout Creator (DIYLC).
Copyright (c) 2009-2025 held jointly by the individual authors.
This file is part of DIYLC.
DIYLC is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
DIYLC is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with DIYLC. If not, see <http://www.gnu.org/licenses/>.
*/
package org.diylc.presenter;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import org.diylc.common.PCBLayer;
import org.diylc.components.composite.CompositeComponent;
import org.diylc.components.connectivity.CopperTrace;
import org.diylc.components.connectivity.Eyelet;
import org.diylc.components.connectivity.Jumper;
import org.diylc.components.connectivity.SolderPad;
import org.diylc.components.connectivity.Turret;
import org.diylc.components.connectivity.Via;
import org.diylc.components.passive.Resistor;
import org.diylc.core.IDIYComponent;
import org.diylc.core.LayerIds;
import org.junit.Test;
public class ComponentLayersTest {
private static final int BOTTOM = LayerIds.BOTTOM_TRACES;
private static final int TOP = LayerIds.TOP_TRACES;
@Test
public void testCopperIsOnTheLayerOfItsSide() {
assertOnlyOn(trace(PCBLayer._1), BOTTOM);
assertOnlyOn(trace(PCBLayer._2), TOP);
}
@SuppressWarnings("deprecation")
@Test
public void testInnerLayerCopperIsOnTheBottom() {
assertOnlyOn(trace(PCBLayer._5), BOTTOM);
}
@Test
public void testComponentsThroughTheBoardAreOnBothTraceLayers() {
assertOnBoth(pad(SolderPad.HoleType.PTH));
assertOnBoth(new Via());
assertOnBoth(new Eyelet());
assertOnBoth(new Turret());
}
@Test
public void testNonPlatedPadIsOnItsSide() {
assertOnlyOn(pad(SolderPad.HoleType.NTPH), BOTTOM);
}
@Test
public void testJumperIsOnTopTraces() {
assertOnlyOn(new Jumper(), TOP);
}
@Test
public void testTraceBlockIsOnBothTraceLayers() {
CompositeComponent block = new CompositeComponent();
block.getChildComponents().addAll(Arrays.asList(trace(PCBLayer._1), trace(PCBLayer._2)));
assertOnBoth(block);
}
@Test
public void testOtherComponentsKeepTheirZOrderLayer() {
Resistor resistor = new Resistor();
assertTrue(ComponentLayers.isOnLayer(resistor, IDIYComponent.COMPONENT));
assertFalse(ComponentLayers.isOnLayer(resistor, TOP));
assertTrue(ComponentLayers.isHidden(set(IDIYComponent.COMPONENT), resistor));
assertTrue(ComponentLayers.isLocked(set(IDIYComponent.COMPONENT), resistor));
}
@Test
public void testComponentOnBothIsHiddenWithBothAndLockedWithEither() {
Via via = new Via();
assertFalse(ComponentLayers.isHidden(set(BOTTOM), via));
assertTrue(ComponentLayers.isHidden(set(BOTTOM, TOP), via));
assertTrue(ComponentLayers.isLocked(set(BOTTOM), via));
assertTrue(ComponentLayers.isLocked(set(TOP), via));
assertFalse(ComponentLayers.isLocked(set(IDIYComponent.COMPONENT), via));
}
@Test
public void testJumperStaysUnlockedWithOnlyBottomTracesLocked() {
assertFalse(ComponentLayers.isLocked(set(BOTTOM), new Jumper()));
}
private static void assertOnlyOn(IDIYComponent<?> component, int layer) {
int other = layer == BOTTOM ? TOP : BOTTOM;
assertTrue(ComponentLayers.isOnLayer(component, layer));
assertFalse(ComponentLayers.isOnLayer(component, other));
assertFalse(ComponentLayers.isOnLayer(component, IDIYComponent.TRACE));
assertTrue(ComponentLayers.isHidden(set(layer), component));
assertFalse(ComponentLayers.isHidden(set(other), component));
assertTrue(ComponentLayers.isLocked(set(layer), component));
assertFalse(ComponentLayers.isLocked(set(other), component));
}
private static void assertOnBoth(IDIYComponent<?> component) {
assertTrue(ComponentLayers.isOnLayer(component, BOTTOM));
assertTrue(ComponentLayers.isOnLayer(component, TOP));
}
private static CopperTrace trace(PCBLayer layer) {
CopperTrace trace = new CopperTrace();
trace.setLayer(layer);
return trace;
}
private static SolderPad pad(SolderPad.HoleType holeType) {
SolderPad pad = new SolderPad();
pad.setLayer(PCBLayer._1);
pad.setHoleType(holeType);
return pad;
}
private static Set<Integer> set(Integer... layers) {
return new HashSet<Integer>(Arrays.asList(layers));
}
}