diff --git a/diylc/diylc-core/src/main/resources/update.xml b/diylc/diylc-core/src/main/resources/update.xml index bf5d2deb..83876df3 100644 --- a/diylc/diylc-core/src/main/resources/update.xml +++ b/diylc/diylc-core/src/main/resources/update.xml @@ -265,6 +265,10 @@ IMPROVEMENT Improved robustness of series/parallel graph construction code used in circuit analysis + + IMPROVEMENT + Omit boards, wires, traces, terminals, etc from Spice netlist output + BUG_FIX Moving selected components with a mouse doesn't register file modification action and doesn't enable Undo action diff --git a/diylc/diylc-library/src/main/java/org/diylc/netlist/SpiceAnalyzer.java b/diylc/diylc-library/src/main/java/org/diylc/netlist/SpiceAnalyzer.java index 7ba4652b..ba7b74e7 100644 --- a/diylc/diylc-library/src/main/java/org/diylc/netlist/SpiceAnalyzer.java +++ b/diylc/diylc-library/src/main/java/org/diylc/netlist/SpiceAnalyzer.java @@ -61,9 +61,14 @@ public class SpiceAnalyzer extends NetlistAnalyzer implements INetlistAnalyzer { protected Summary summarize(Netlist netlist, Node preferredOutput) throws TreeException { // grab all components that are in the netlist - List> allComponents = netlist.getComponents(); - List groups = netlist.getSortedGroups(); + + List> allComponents = groups.stream() + .flatMap(x -> x.getNodes().stream() + .map(y -> y.getComponent())) + .distinct() + .collect(Collectors.toList()); + int unconnectedIndex = groups.size(); int maxLen = 0;