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

treble bleed enhancements

Browse Source
This commit is contained in:
Bane Stojkovic
2026-06-07 23:02:47 +02:00
parent efa803d7d0
commit 6a590af026
2 changed files with 44 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-library/src/main/java/org/diylc/netlist/GuitarDiagramAnalyzer.java
+3 -17
View File
@@ -369,26 +369,12 @@ public class GuitarDiagramAnalyzer extends AbstractNetlistAnalyzer implements IN
notes.add(sb.toString());
TrebleBleed trebleBleed = volPotTrebleBleedMap.get(e.getKey());
Set<IDIYComponent<?>> trebleBleedComponents = trebleBleed.components();
if (trebleBleedComponents != null && !trebleBleedComponents.isEmpty()) {
TrebleBleed.AnalysisResult analyze = trebleBleed.analyze();
String strComponents =
trebleBleedComponents.stream().sorted(Comparator.comparing(IDIYComponent::getName))
.map(c -> "'" + c.getName() + "'").collect(Collectors.joining(", "));
String trebleBleedNote = strComponents + (trebleBleedComponents.size() == 1 ? " forms a " : " form a ");
if (analyze.circuitType() != null) {
trebleBleedNote += analyze.circuitType() + " ";
}
trebleBleedNote = trebleBleedNote + "treble bleed circuit on the '" + e.getKey().getName() + "' volume control";
if (analyze.style() != null) {
trebleBleedNote = trebleBleedNote + ", in the style of " + analyze.style();
}
String trebleBleedNote = trebleBleed.toNote(e.getKey());
if (trebleBleedNote != null && !trebleBleedNote.isEmpty()) {
notes.add(trebleBleedNote);
}
}
private void processPotentiometer(IDIYComponent<?> pot, Tree tree, Map<IDIYComponent<?>, Tree> pickupRoots,
Map<IDIYComponent<?>, List<IDIYComponent<?>>> tonePotPickupReverseMap,
Map<IDIYComponent<?>, List<IDIYComponent<?>>> tonePotPickupMap,
diylc/diylc-library/src/main/java/org/diylc/netlist/TrebleBleed.java
+41 -14
View File
@@ -3,12 +3,38 @@ package org.diylc.netlist;
import org.diylc.core.IDIYComponent;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
public record TrebleBleed(Set<IDIYComponent<?>> components, TreeConnectionType connectionType) {
public AnalysisResult analyze() {
public String toNote(IDIYComponent<?> volumePotComponent) {
Set<IDIYComponent<?>> trebleBleedComponents = components();
if (trebleBleedComponents != null && !trebleBleedComponents.isEmpty()) {
TrebleBleed.AnalysisResult analyze = analyze();
String strComponents =
trebleBleedComponents.stream().sorted(Comparator.comparing(IDIYComponent::getName))
.map(c -> "'" + c.getName() + "'").collect(Collectors.joining(", "));
String trebleBleedNote =
strComponents + (trebleBleedComponents.size() == 1 ? " forms a " : " form a ");
if (analyze.circuitType() != null) {
trebleBleedNote += analyze.circuitType() + " ";
}
trebleBleedNote = trebleBleedNote + "treble bleed circuit on the '" + volumePotComponent
.getName() + "' volume control";
if (analyze.style() != null) {
trebleBleedNote = trebleBleedNote + ", in the style of " + analyze.style();
}
return trebleBleedNote;
}
return null;
}
private AnalysisResult analyze() {
List<Double> capValues = new ArrayList<>();
List<Double> resValues = new ArrayList<>();
for (IDIYComponent<?> c : components) {
@@ -25,28 +51,34 @@ public record TrebleBleed(Set<IDIYComponent<?>> components, TreeConnectionType c
String style;
if (components.size() == 1) {
circuitType = null;
style = "PRS, G&L";
style = "PRS, G&L, Ibanez, Ernie Ball Music Man (values not matching exactly)";
if (capValues.size() == 1) {
Double cVal = capValues.get(0);
if (matches(cVal, 180e-6)) {
style = "PRS";
} else if (matches(cVal, 200e-6)) {
style = "G&L";
} else if (matches(cVal, 330e-6)) {
style = "Ibanez, Ernie Ball Music Man";
}
}
} else if (components.size() == 2 && connectionType == TreeConnectionType.Series) {
circuitType = "series";
style = "Kinman";
style = "Kinman, Fender Tone Saver (values not matching exactly)";
if (capValues.size() == 1 && resValues.size() == 1) {
Double cVal = capValues.get(0);
Double rVal = resValues.get(0);
if (matches(cVal, 1.2e-3) && matches(rVal, 130e3)) {
style = "Kinman";
} else if (matches(cVal, 1e-3) && matches(rVal, 130e3)) {
style = "Fender Tone Saver (250K)";
} else if (matches(cVal, 500e-6) && matches(rVal, 240e3)) {
style = "Fender Tone Saver (500K)";
}
}
} else if (components.size() == 2 && connectionType == TreeConnectionType.Parallel) {
circuitType = "parallel";
style = "Fender, Suhr, Fralin, Bill Lawrence, Mojo Tone, TV Jones, DiMarzio, Seymour Duncan";
style = "Fender, Suhr, Fralin, Bill Lawrence, Mojo Tone, TV Jones, DiMarzio, Seymour Duncan, Bare Knuckle Pickups, Emerson Custom (values not matching exactly)";
if (capValues.size() == 1 && resValues.size() == 1) {
Double cVal = capValues.get(0);
Double rVal = resValues.get(0);
@@ -54,10 +86,14 @@ public record TrebleBleed(Set<IDIYComponent<?>> components, TreeConnectionType c
style = "Bill Lawrence";
} else if (matches(cVal, 471e-6) && matches(rVal, 220e3)) {
style = "Mojo Tone";
} else if (matches(cVal, 470e-6) && matches(rVal, 220e3)) {
style = "Emerson Custom";
} else if (matches(cVal, 560e-6) && matches(rVal, 300e3)) {
style = "DiMarzio";
} else if (matches(cVal, 680e-6) && matches(rVal, 150e3)) {
style = "John Suhr";
} else if ((matches(cVal, 680e-6) || matches(cVal, 1e-3)) && matches(rVal, 220e3)) {
style = "Bare Knuckle Pickups";
} else if ((matches(cVal, 1e-3) || matches(cVal, 2e-3)) && matches(rVal, 150e3)) {
style = "TV Jones";
} else if (matches(cVal, 1e-3) && matches(rVal, 100e3)) {
@@ -66,15 +102,6 @@ public record TrebleBleed(Set<IDIYComponent<?>> components, TreeConnectionType c
style = "Lindy Fralin";
}
}
} else if (components.size() == 3) {
circuitType = null;
style = null;
if (capValues.size() == 1 && resValues.size() == 2) {
Double cVal = capValues.get(0);
if (matches(cVal, 1.2e-3) && ((matches(resValues.get(0), 150e3) && matches(resValues.get(1), 20e3)) || (matches(resValues.get(0), 20e3) && matches(resValues.get(1), 150e3)))) {
style = "Fender";
}
}
} else {
circuitType = null;
style = null;
@@ -87,5 +114,5 @@ public record TrebleBleed(Set<IDIYComponent<?>> components, TreeConnectionType c
return val != null && Math.abs(val - expected) < expected * 1e-4;
}
public record AnalysisResult(String circuitType, String style) {}
private record AnalysisResult(String circuitType, String style) {}
}