rusefi
/
KiCad-utils
mirror of https://github.com/rusefi/KiCad-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

extract constant

This commit is contained in:
rusefillc 2021-01-09 16:07:52 -05:00
parent ced729a4d5
commit d3cb865e3e
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/rusefi/pcb/PcbMergeTool.java
View File

@ -14,6 +14,10 @@ import static com.rusefi.pcb.nodes.PcbNode.*;
* 12/16/13.
*/
public class PcbMergeTool {
public static final String TOKEN_GR_ARC = "gr_arc";
public static final String TOKEN_GR_LINE = "gr_line";
public static final String TOKEN_GR_TEXT = "gr_text";
public static final String TOKEN_MODULE = "module";
private static Networks networks = new Networks();
public static void main(String[] args) throws IOException {
@ -38,7 +42,7 @@ public class PcbMergeTool {
PcbNode destNode = PcbNode.readFromFile(sourcePcb);
for (PcbNode net : destNode.iterate("net")) {
for (PcbNode net : destNode.iterate(TOKEN_NET)) {
String netName = net.getChild(1); // todo: nicer method?
if (!Networks.isLocalNetwork(netName))
networks.registerNetworkIfPcbSpecific(netName);
@ -106,13 +110,13 @@ public class PcbMergeTool {
destNode.addChild(zone);
}
List<PcbNode> arcs = source.iterate("gr_arc");
List<PcbNode> arcs = source.iterate(TOKEN_GR_ARC);
log("Processing " + arcs.size() + " arc(s)");
for (PcbNode arc : arcs)
destNode.addChild(arc);
List<PcbNode> lines = source.iterate("gr_line");
List<PcbNode> lines = source.iterate(TOKEN_GR_LINE);
log("Processing " + lines.size() + " line(s)");
for (PcbNode l : lines) {
GrLineNode line = (GrLineNode) l;
@ -121,13 +125,13 @@ public class PcbMergeTool {
}
List<PcbNode> labels = source.iterate("gr_text");
List<PcbNode> labels = source.iterate(TOKEN_GR_TEXT);
log("Processing " + labels.size() + " label(s)");
for (PcbNode label : labels) {
destNode.addChild(label);
}
List<PcbNode> modules = source.iterate("module");
List<PcbNode> modules = source.iterate(TOKEN_MODULE);
log("Processing " + modules.size() + " module(s)");
for (PcbNode module : modules) {
for (PcbNode pad : module.iterate(TOKEN_PAD)) {
@ -145,7 +149,7 @@ public class PcbMergeTool {
List<PcbNode> segments = source.iterate(TOKEN_SEGMENT);
log("Processing " + segments.size() + " segments");
for (PcbNode segment : segments) {
// if (!segment.hasChild("net"))
// if (!segment.hasChild(TOKEN_NET))
// continue;
fixNetId(netIdMapping, netNameMapping, segment);
@ -160,7 +164,7 @@ public class PcbMergeTool {
destNode.addChild(pad);
}
List<PcbNode> vias = source.iterate("via");
List<PcbNode> vias = source.iterate(TOKEN_VIA);
log("Processing " + vias.size() + " vias");
for (PcbNode via : vias) {
fixNetId(netIdMapping, netNameMapping, via);
@ -193,7 +197,7 @@ public class PcbMergeTool {
}
private static void fixNetId(Map<String, Integer> netIdMapping, Map<String, String> netNameMapping, PcbNode node) {
NetNode net = (NetNode) node.find("net");
NetNode net = node.find(TOKEN_NET);
String originalId = net.id;
Integer currentNetId = netIdMapping.get(originalId);
String globalName = networks.nameById.get(currentNetId);

12
src/main/java/com/rusefi/pcb/PcbMoveTool.java
View File

@ -5,7 +5,9 @@ import com.rusefi.pcb.nodes.PcbNode;
import java.io.IOException;
import java.util.List;
import static com.rusefi.pcb.PcbMergeTool.*;
import static com.rusefi.pcb.nodes.PcbNode.TOKEN_GR_LINE;
import static com.rusefi.pcb.nodes.PcbNode.TOKEN_VIA;
/**
* (c) Andrey Belomutskiy
@ -54,7 +56,7 @@ public class PcbMoveTool {
for (PcbNode gr_line : gr_lines)
moveStartEnd(dx, dy, gr_line);
List<PcbNode> gr_arcs = pcbNode.iterate("gr_arc");
List<PcbNode> gr_arcs = pcbNode.iterate(TOKEN_GR_ARC);
System.out.println("Moving " + gr_arcs.size() + " gr_arcs");
for (PcbNode gr_arc : gr_arcs) {
PcbNode start = gr_arc.find("start");
@ -74,12 +76,12 @@ public class PcbMoveTool {
moveCoordinatesInFirstChildren(dx, dy, end);
}
List<PcbNode> gr_texts = pcbNode.iterate("gr_text");
List<PcbNode> gr_texts = pcbNode.iterate(TOKEN_GR_TEXT);
System.out.println("Moving " + gr_texts.size() + " gr_texts");
for (PcbNode gr_text : gr_texts)
moveAt(dx, dy, gr_text);
List<PcbNode> zones = pcbNode.iterate("zone");
List<PcbNode> zones = pcbNode.iterate(PcbNode.TOKEN_ZONE);
System.out.println("Moving " + zones.size() + " zones");
for (PcbNode zone : zones) {
List<PcbNode> filledPolygons = zone.iterate("filled_polygon");
@ -96,13 +98,13 @@ public class PcbMoveTool {
for (PcbNode segment : segments)
moveStartEnd(dx, dy, segment);
List<PcbNode> vias = pcbNode.iterate("via");
List<PcbNode> vias = pcbNode.iterate(TOKEN_VIA);
System.out.println("Moving " + vias.size() + " vias");
for (PcbNode via : vias)
moveAt(dx, dy, via);
List<PcbNode> modules = pcbNode.iterate("module");
List<PcbNode> modules = pcbNode.iterate(TOKEN_MODULE);
System.out.println("Moving " + modules.size() + " modules");
for (PcbNode module : modules)
moveAt(dx, dy, module);

7
src/main/java/com/rusefi/pcb/RemoveUnneededTraces.java
View File

@ -9,6 +9,7 @@ import java.util.List;
import java.util.Set;
import static com.rusefi.pcb.nodes.PcbNode.TOKEN_SEGMENT;
import static com.rusefi.pcb.nodes.PcbNode.TOKEN_VIA;
/**
* @author Andrey Belomutskiy
@ -57,7 +58,7 @@ public class RemoveUnneededTraces {
List<PcbNode> stuff = destNode.iterate(TOKEN_SEGMENT);
// stuff.addAll(destNode.iterate("segment"));
for (PcbNode n : destNode.iterate("via")) {
for (PcbNode n : destNode.iterate(TOKEN_VIA)) {
ViaNode via = (ViaNode) n;
int count = 0;
@ -78,8 +79,8 @@ public class RemoveUnneededTraces {
}
private static boolean removeUnusedSegments(PcbNode destNode) {
List<PcbNode> stuff = new ArrayList<PcbNode>(destNode.iterate("module"));
stuff.addAll(destNode.iterate("via"));
List<PcbNode> stuff = new ArrayList<PcbNode>(destNode.iterate(PcbMergeTool.TOKEN_MODULE));
stuff.addAll(destNode.iterate(TOKEN_VIA));
Object o = destNode.iterate("segment");