From 54e97b9adc97d09fa029ed4a7c398ce073cfea64 Mon Sep 17 00:00:00 2001 From: Branislav Stojkovic Date: Wed, 9 Jan 2019 16:00:21 +0100 Subject: [PATCH] no poles for humbuckers --- diylc/diylc-library/lib/diylc-core.jar | Bin 250178 -> 250178 bytes .../components/guitar/HumbuckerPickup.java | 6 +- diylc/diylc-swing/lib/diylc-core.jar | Bin 250178 -> 250178 bytes diylc/diylc-swing/library/main.jar | Bin 475765 -> 475800 bytes diylc/diylc-swing/update.xml | 2 +- diylc/diylc-swing/variants.xml | 790 ++++++++++-------- 6 files changed, 437 insertions(+), 361 deletions(-) diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index 8e1a4bd9e593e682795d9c539cd7d3d532ffb378..de1686d2e682b8b2aff2245aa499717b15f6f701 100644 GIT binary patch delta 4266 zcmY*cd0da_7XLlZlfuCF` zM<)MAtbNTf&rXblkog2*f;hz_FuoBk0AmbB0jx9_u0XNYAb|r8HoDja%#V9K0=Q=U z39NdP1_qd7W^Vvk*(VZp*M3Eq)oBroxY}x_0RL$lThv=@ixDFS&Bpj}U9T3D;<14755kb15T9 z^e%ojGXR4oA`GZBm3Ub+M07y9-yf%u@crl{`< z+KBP(8+ARvuH9*f_OwvT-k_Hyy+yq+#T>_b^^gPV?P-URHzs{7=GSIepnhNHg#K

_HM;0+O5BS1~uds-Anv!GbGX7 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 diff --git a/diylc/diylc-library/src/org/diylc/components/guitar/HumbuckerPickup.java b/diylc/diylc-library/src/org/diylc/components/guitar/HumbuckerPickup.java index acdc8dc1..fe564905 100644 --- a/diylc/diylc-library/src/org/diylc/components/guitar/HumbuckerPickup.java +++ b/diylc/diylc-library/src/org/diylc/components/guitar/HumbuckerPickup.java @@ -225,7 +225,7 @@ public class HumbuckerPickup extends AbstractTransparentComponent { poleArea.add(new Area( new RoundRectangle2D.Double(x + pointMargin - length + poleMargin - poleSize / 2, y - pointMargin + coilMargin - poleSize / 2, poleSpacing * 5 + poleSize, poleSize, poleSize / 2, poleSize / 2))); - } else { + } else if (getCoilType1() == PolePieceType.Rods) { for (int i = 0; i < 6; i++) { if (getType() == HumbuckerType.PAF || !getCover()) { Ellipse2D pole = @@ -240,7 +240,7 @@ public class HumbuckerPickup extends AbstractTransparentComponent { 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, poleSize / 2))); - } else { + } else if (getCoilType1() == PolePieceType.Rods) { for (int i = 0; i < 6; i++) { Ellipse2D pole = new Ellipse2D.Double(x + pointMargin - length + poleMargin + i * poleSpacing - poleSize / 2, y @@ -482,6 +482,6 @@ public class HumbuckerPickup extends AbstractTransparentComponent { } public enum PolePieceType { - Rods, Rail; + Rods, Rail, None; } } diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index 8e1a4bd9e593e682795d9c539cd7d3d532ffb378..de1686d2e682b8b2aff2245aa499717b15f6f701 100644 GIT binary patch delta 4266 zcmY*cd0da_7XLlZlfuCF` zM<)MAtbNTf&rXblkog2*f;hz_FuoBk0AmbB0jx9_u0XNYAb|r8HoDja%#V9K0=Q=U z39NdP1_qd7W^Vvk*(VZp*M3Eq)oBroxY}x_0RL$lThv=@ixDFS&Bpj}U9T3D;<14755kb15T9 z^e%ojGXR4oA`GZBm3Ub+M07y9-yf%u@crl{`< z+KBP(8+ARvuH9*f_OwvT-k_Hyy+yq+#T>_b^^gPV?P-URHzs{7=GSIepnhNHg#K

_HM;0+O5BS1~uds-Anv!GbGX7 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 diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar index 557ad21439cd2195cc66a68d2a2ffb7ff417b388..933eb0b5803588bac5b0d4c625721ff2baf0ef5a 100644 GIT binary patch delta 14732 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 delta 14850 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 diff --git a/diylc/diylc-swing/update.xml b/diylc/diylc-swing/update.xml index b00aa5b6..78d85c44 100644 --- a/diylc/diylc-swing/update.xml +++ b/diylc/diylc-swing/update.xml @@ -2148,7 +2148,7 @@ NEW_FEATURE - Ability to have "Single-coil Pickup" with no poles, similar to Lace Sensors + Ability to have "Single-coil Pickup" and "Humbucker Pickup" with no poles, similar to EMG, Lace Sensor... IMPROVEMENT diff --git a/diylc/diylc-swing/variants.xml b/diylc/diylc-swing/variants.xml index 74f494e2..94497fd9 100644 --- a/diylc/diylc-swing/variants.xml +++ b/diylc/diylc-swing/variants.xml @@ -18,14 +18,6 @@ Alpha 127 - - Model - - - - Orientation - DEFAULT - Pole Color @@ -35,6 +27,14 @@ 255 + + Orientation + DEFAULT + + + Model + + Type Stratocaster @@ -73,16 +73,16 @@ 127 - Model - + Pole Color + Orientation DEFAULT - Pole Color - + Model + Type @@ -117,16 +117,16 @@ 127 - Model - + Pole Color + Orientation DEFAULT - Pole Color - + Model + Type @@ -161,16 +161,16 @@ 127 - Model - + Pole Color + Orientation DEFAULT - Pole Color - + Model + Type @@ -205,16 +205,16 @@ 127 - Model - + Pole Color + Orientation DEFAULT - Pole Color - + Model + Type @@ -249,16 +249,16 @@ 127 - Model - + Pole Color + Orientation DEFAULT - Pole Color - + Model + Type @@ -289,6 +289,10 @@ DPDT + + Alpha + 127 + Body @@ -298,18 +302,10 @@ 255 - - Alpha - 127 - Orientation VERTICAL - - Type - DPDT - Border @@ -319,6 +315,10 @@ 255 + + Type + DPDT + Spacing @@ -358,25 +358,25 @@ SPDT - - Body - - Alpha 127 + + Body + + Orientation VERTICAL - Type - SPDT + Border + - Border - + Type + SPDT Spacing @@ -781,8 +781,10 @@ - Alpha - 127 + Value + + + Body @@ -794,10 +796,8 @@ - Value - - - + Alpha + 127 Orientation @@ -812,14 +812,14 @@ 255 - - Display - BOTH - Voltage + + Display + BOTH + Label @@ -871,12 +871,8 @@ - Value - - - - - + Alpha + 127 Body @@ -888,8 +884,12 @@ - Alpha - 127 + Value + + + + + Orientation @@ -904,14 +904,14 @@ 255 - - Voltage - - Display BOTH + + Voltage + + Label @@ -971,8 +971,13 @@ - Alpha - 127 + Value + + + + + + Body @@ -984,13 +989,8 @@ - Value - - - - - - + Alpha + 127 Orientation @@ -1005,14 +1005,14 @@ 255 - - Display - BOTH - Voltage + + Display + BOTH + Label @@ -1068,19 +1068,19 @@ - Alpha - 127 + Value + + + + Body - Value - - - - + Alpha + 127 Orientation @@ -1090,14 +1090,14 @@ Border - - Display - BOTH - Voltage + + Display + BOTH + Label @@ -1125,6 +1125,241 @@ + + Semiconductors.DIP IC + + + DIP8 + + + Row Spacing + + 0.3 + in + + + + Pins + _8 + + + Alpha + 127 + + + Body + + + + Value + + + + Orientation + DEFAULT + + + Border + + 89 + 89 + 89 + 255 + + + + Display + BOTH + + + Label + + + + Display Pin #s + NO + + + Indent + + 89 + 89 + 89 + 255 + + + + Pin Spacing + + 0.1 + in + + + + + + 0 + 0 + + + 0 + 20 + + + 0 + 40 + + + 0 + 60 + + + 60 + 0 + + + 60 + 20 + + + 60 + 40 + + + 60 + 60 + + + false + + + DIP16 + + + Row Spacing + + 0.3 + in + + + + Pins + _16 + + + Alpha + 127 + + + Body + + + + Value + + + + Orientation + DEFAULT + + + Border + + + + Display + BOTH + + + Label + + + + Display Pin #s + NO + + + Indent + + + + Pin Spacing + + 0.1 + in + + + + + + 0 + 0 + + + 0 + 20 + + + 0 + 40 + + + 0 + 60 + + + 0 + 80 + + + 0 + 100 + + + 0 + 120 + + + 0 + 140 + + + 60 + 0 + + + 60 + 20 + + + 60 + 40 + + + 60 + 60 + + + 60 + 80 + + + 60 + 100 + + + 60 + 120 + + + 60 + 140 + + + false + + + Passive.Resistor @@ -2021,255 +2256,20 @@ - - Semiconductors.DIP IC - - - DIP8 - - - Pins - _8 - - - Row Spacing - - 0.3 - in - - - - Value - - - - Body - - - - Alpha - 127 - - - Orientation - DEFAULT - - - Border - - 89 - 89 - 89 - 255 - - - - Display - BOTH - - - Label - - - - Display Pin #s - NO - - - Indent - - 89 - 89 - 89 - 255 - - - - Pin Spacing - - 0.1 - in - - - - - - 0 - 0 - - - 0 - 20 - - - 0 - 40 - - - 0 - 60 - - - 60 - 0 - - - 60 - 20 - - - 60 - 40 - - - 60 - 60 - - - false - - - DIP16 - - - Pins - _16 - - - Row Spacing - - 0.3 - in - - - - Value - - - - Body - - - - Alpha - 127 - - - Orientation - DEFAULT - - - Border - - - - Display - BOTH - - - Label - - - - Display Pin #s - NO - - - Indent - - - - Pin Spacing - - 0.1 - in - - - - - - 0 - 0 - - - 0 - 20 - - - 0 - 40 - - - 0 - 60 - - - 0 - 80 - - - 0 - 100 - - - 0 - 120 - - - 0 - 140 - - - 60 - 0 - - - 60 - 20 - - - 60 - 40 - - - 60 - 60 - - - 60 - 80 - - - 60 - 100 - - - 60 - 120 - - - 60 - 140 - - - false - - - Tubes.Tube Socket Noval - - Angle - 0 - Base B9A + + Angle + 0 + Alpha 127 @@ -2335,14 +2335,14 @@ Octal - - Angle - 0 - Base OCTAL + + Angle + 0 + Alpha 127 @@ -2404,10 +2404,6 @@ Covered PAF-Style - - Alpha - 127 - Bobin 1 @@ -2417,6 +2413,18 @@ 255 + + Alpha + 127 + + + Model + + + + Orientation + DEFAULT + Pole Color @@ -2426,14 +2434,6 @@ 255 - - Orientation - DEFAULT - - - Model - - Bobin 2 @@ -2480,6 +2480,10 @@ Uncovered PAF-Style + + Alpha + 127 + Bobin 1 @@ -2489,18 +2493,6 @@ 255 - - Alpha - 127 - - - Model - - - - Orientation - DEFAULT - Pole Color @@ -2510,6 +2502,14 @@ 255 + + Orientation + DEFAULT + + + Model + + Bobin 2 @@ -2553,6 +2553,82 @@ false + + EMG-style + + + Alpha + 127 + + + Bobin 1 + + 234 + 227 + 198 + 255 + + + + Pole Color + + 117 + 157 + 175 + 255 + + + + Orientation + DEFAULT + + + Model + + + + Bobin 2 + + 0 + 0 + 0 + 255 + + + + Type + PAF + + + Cover + true + + + Pole Pieces 1 + None + + + Pole Pieces 2 + None + + + Color + + 51 + 51 + 51 + 255 + + + + + + 0 + 0 + + + false + \ No newline at end of file