no poles for humbuckers

This commit is contained in:
Branislav Stojkovic
2019-01-09 16:00:21 +01:00
parent 4ebd1deed4
commit 54e97b9adc
6 changed files with 437 additions and 361 deletions
Binary file not shown.
@@ -225,7 +225,7 @@ public class HumbuckerPickup extends AbstractTransparentComponent<String> {
poleArea.add(new Area( poleArea.add(new Area(
new RoundRectangle2D.Double(x + pointMargin - length + poleMargin - poleSize / 2, y - pointMargin new RoundRectangle2D.Double(x + pointMargin - length + poleMargin - poleSize / 2, y - pointMargin
+ coilMargin - poleSize / 2, poleSpacing * 5 + poleSize, poleSize, poleSize / 2, poleSize / 2))); + coilMargin - poleSize / 2, poleSpacing * 5 + poleSize, poleSize, poleSize / 2, poleSize / 2)));
} else { } else if (getCoilType1() == PolePieceType.Rods) {
for (int i = 0; i < 6; i++) { for (int i = 0; i < 6; i++) {
if (getType() == HumbuckerType.PAF || !getCover()) { if (getType() == HumbuckerType.PAF || !getCover()) {
Ellipse2D pole = Ellipse2D pole =
@@ -240,7 +240,7 @@ public class HumbuckerPickup extends AbstractTransparentComponent<String> {
poleArea.add(new Area(new RoundRectangle2D.Double(x + pointMargin - length + poleMargin - poleSize / 2, y poleArea.add(new Area(new RoundRectangle2D.Double(x + pointMargin - length + poleMargin - poleSize / 2, y
- pointMargin + width - coilMargin - poleSize / 2, poleSpacing * 5 + poleSize, poleSize, poleSize / 2, - pointMargin + width - coilMargin - poleSize / 2, poleSpacing * 5 + poleSize, poleSize, poleSize / 2,
poleSize / 2))); poleSize / 2)));
} else { } else if (getCoilType1() == PolePieceType.Rods) {
for (int i = 0; i < 6; i++) { for (int i = 0; i < 6; i++) {
Ellipse2D pole = Ellipse2D pole =
new Ellipse2D.Double(x + pointMargin - length + poleMargin + i * poleSpacing - poleSize / 2, y new Ellipse2D.Double(x + pointMargin - length + poleMargin + i * poleSpacing - poleSize / 2, y
@@ -482,6 +482,6 @@ public class HumbuckerPickup extends AbstractTransparentComponent<String> {
} }
public enum PolePieceType { public enum PolePieceType {
Rods, Rail; Rods, Rail, None;
} }
} }
Binary file not shown.
Binary file not shown.
+1 -1
View File
@@ -2148,7 +2148,7 @@
</org.diylc.appframework.update.Change> </org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change> <org.diylc.appframework.update.Change>
<changeType>NEW_FEATURE</changeType> <changeType>NEW_FEATURE</changeType>
<description>Ability to have "Single-coil Pickup" with no poles, similar to Lace Sensors</description> <description>Ability to have "Single-coil Pickup" and "Humbucker Pickup" with no poles, similar to EMG, Lace Sensor...</description>
</org.diylc.appframework.update.Change> </org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change> <org.diylc.appframework.update.Change>
<changeType>IMPROVEMENT</changeType> <changeType>IMPROVEMENT</changeType>
File diff suppressed because it is too large Load Diff