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

improve pickups

Browse Source
This commit is contained in:
bancika
2016-12-29 13:58:05 +01:00
parent 1bf2825f80
commit a3f8910268
5 changed files with 97 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-library/lib/diylc-core.jar
BIN
View File
Binary file not shown.
diylc/diylc-library/src/org/diylc/components/guitar/HumbuckerPickup.java
+93 -13
View File
@@ -40,9 +40,10 @@ public class HumbuckerPickup extends AbstractTransparentComponent<String> {
private static final long serialVersionUID = 1L;
private static Color BODY_COLOR = Color.lightGray;
private static Color BASE_COLOR = Color.lightGray;
private static Color BOBIN_COLOR1 = Color.decode("#EAE3C6");
private static Color BOBIN_COLOR2 = Color.black;
private static Color POINT_COLOR = Color.darkGray;
public static Color POLE_COLOR = METAL_COLOR;
private static Size WIDTH = new Size(36.5d, SizeUnit.mm);
private static Size LENGTH = new Size(68.58d, SizeUnit.mm);
private static Size WIDTH_MINI = new Size(29.3d, SizeUnit.mm);
@@ -55,14 +56,16 @@ public class HumbuckerPickup extends AbstractTransparentComponent<String> {
private static Size LIP_HOLE_SIZE = new Size(1.5d, SizeUnit.mm);
private static Size POLE_SIZE = new Size(3d, SizeUnit.mm);
private static Size POLE_SPACING = new Size(10.1d, SizeUnit.mm);
private static Size COIL_SPACING = new Size(18d, SizeUnit.mm);
private String value = "";
private Point controlPoint = new Point(0, 0);
transient Shape[] body;
private Orientation orientation = Orientation.DEFAULT;
private Color color = BODY_COLOR;
private Color color = BASE_COLOR;
private HumbuckerType type;
private boolean cover;
private Color bobinColor1 = BOBIN_COLOR1;
private Color bobinColor2 = BOBIN_COLOR2;
@Override
public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project,
@@ -80,6 +83,16 @@ public class HumbuckerPickup extends AbstractTransparentComponent<String> {
g2d.fill(body[1]);
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : POINT_COLOR);
g2d.fill(body[2]);
if (body[4] != null) {
g2d.setColor(getBobinColor1());
g2d.fill(body[4]);
}
if (body[5] != null) {
g2d.setColor(getBobinColor2());
g2d.fill(body[5]);
}
g2d.setComposite(oldComposite);
}
@@ -100,10 +113,19 @@ public class HumbuckerPickup extends AbstractTransparentComponent<String> {
g2d.draw(body[0]);
g2d.draw(body[1]);
if (!outlineMode && componentState != ComponentState.DRAGGING) {
g2d.setColor(POLE_COLOR);
g2d.setColor(METAL_COLOR);
g2d.fill(body[3]);
g2d.setColor(color.darker());
g2d.setColor(METAL_COLOR.darker());
g2d.draw(body[3]);
if (body[4] != null) {
g2d.setColor(getBobinColor1().darker());
g2d.draw(body[4]);
}
if (body[5] != null) {
g2d.setColor(getBobinColor2().darker());
g2d.draw(body[5]);
}
}
Color finalLabelColor;
@@ -128,7 +150,7 @@ public class HumbuckerPickup extends AbstractTransparentComponent<String> {
@SuppressWarnings("incomplete-switch")
public Shape[] getBody() {
if (body == null) {
body = new Shape[4];
body = new Shape[6];
int x = controlPoint.x;
int y = controlPoint.y;
@@ -144,6 +166,17 @@ public class HumbuckerPickup extends AbstractTransparentComponent<String> {
body[0] =
new Area(new RoundRectangle2D.Double(x + pointMargin - length, y - pointMargin, length, width, edgeRadius,
edgeRadius));
if (!getCover()) {
int bobinWidth = width / 2;
body[4] =
new Area(new RoundRectangle2D.Double(x + pointMargin - length, y - pointMargin, length, bobinWidth,
bobinWidth, bobinWidth));
body[5] =
new Area(new RoundRectangle2D.Double(x + pointMargin - length, y - pointMargin + bobinWidth, length,
bobinWidth, bobinWidth, bobinWidth));
}
body[1] =
new Area(new RoundRectangle2D.Double(x + pointMargin - length - lipLength, y - pointMargin + width / 2
- lipWidth / 2, length + 2 * lipLength, lipWidth, edgeRadius / 2, edgeRadius / 2));
@@ -158,12 +191,12 @@ public class HumbuckerPickup extends AbstractTransparentComponent<String> {
int poleSize = (int) POLE_SIZE.convertToPixels();
int poleSpacing = (int) POLE_SPACING.convertToPixels();
int coilSpacing = (int) COIL_SPACING.convertToPixels();
int coilSpacing = width / 2;
int coilMargin = (width - coilSpacing) / 2;
int poleMargin = (length - poleSpacing * 5) / 2;
Area poleArea = new Area();
for (int i = 0; i < 6; i++) {
if (getType() == HumbuckerType.PAF) {
if (getType() == HumbuckerType.PAF || !getCover()) {
Ellipse2D pole =
new Ellipse2D.Double(x + pointMargin - length + poleMargin + i * poleSpacing - poleSize / 2, y
- pointMargin + coilMargin - poleSize / 2, poleSize, poleSize);
@@ -208,17 +241,31 @@ public class HumbuckerPickup extends AbstractTransparentComponent<String> {
int baseWidth = 16 * width / 32;
int baseLength = 27 * width / 32;
g2d.setColor(BODY_COLOR);
g2d.setColor(BASE_COLOR);
g2d.fillRoundRect((width - baseWidth / 4) / 2, 0, baseWidth / 4, height - 1, 2 * width / 32, 2 * width / 32);
g2d.setColor(BODY_COLOR.darker());
g2d.setColor(BASE_COLOR.darker());
g2d.drawRoundRect((width - baseWidth / 4) / 2, 0, baseWidth / 4, height - 1, 2 * width / 32, 2 * width / 32);
g2d.setColor(BODY_COLOR);
g2d.setColor(BASE_COLOR);
g2d.fillRoundRect((width - baseWidth) / 2, (height - baseLength) / 2, baseWidth, baseLength, 4 * width / 32,
4 * width / 32);
g2d.setColor(BODY_COLOR.darker());
g2d.setColor(BASE_COLOR.darker());
g2d.drawRoundRect((width - baseWidth) / 2, (height - baseLength) / 2, baseWidth, baseLength, 4 * width / 32,
4 * width / 32);
g2d.setColor(BOBIN_COLOR1);
g2d.fillRoundRect((width - baseWidth) / 2, (height - baseLength) / 2, baseWidth / 2, baseLength, baseWidth / 2,
baseWidth / 2);
g2d.setColor(BOBIN_COLOR2);
g2d.fillRoundRect(width / 2, (height - baseLength) / 2, baseWidth / 2, baseLength, baseWidth / 2, baseWidth / 2);
g2d.setColor(METAL_COLOR);
int poleSize = 2;
int poleSpacing = 17 * width / 32;
for (int i = 0; i < 6; i++) {
g2d.fillOval((width - poleSize - baseWidth / 2) / 2, (height - poleSpacing) / 2 + (i * poleSpacing / 5), poleSize, poleSize);
g2d.fillOval((width - poleSize + baseWidth / 2) / 2, (height - poleSpacing) / 2 + (i * poleSpacing / 5), poleSize, poleSize);
}
}
@EditableProperty
@@ -234,6 +281,39 @@ public class HumbuckerPickup extends AbstractTransparentComponent<String> {
body = null;
}
@EditableProperty(name = "Bobin 1")
public Color getBobinColor1() {
if (bobinColor1 == null)
bobinColor1 = BOBIN_COLOR1;
return bobinColor1;
}
public void setBobinColor1(Color bobinColor1) {
this.bobinColor1 = bobinColor1;
}
@EditableProperty(name = "Bobin 2")
public Color getBobinColor2() {
if (bobinColor2 == null)
bobinColor2 = BOBIN_COLOR2;
return bobinColor2;
}
public void setBobinColor2(Color bobinColor2) {
this.bobinColor2 = bobinColor2;
}
@EditableProperty
public boolean getCover() {
return cover;
}
public void setCover(boolean cover) {
this.cover = cover;
// Invalidate the body
body = null;
}
@Override
public int getControlPointCount() {
return 1;
diylc/diylc-library/src/org/diylc/components/guitar/P90Pickup.java
+3 -4
View File
@@ -43,7 +43,6 @@ public class P90Pickup extends AbstractTransparentComponent<String> {
private static Color BODY_COLOR = Color.decode("#D8C989");;
private static Color POINT_COLOR = Color.darkGray;
public static Color POLE_COLOR = METAL_COLOR;
// dog ear
private static Size DOG_EAR_WIDTH = new Size(41d, SizeUnit.mm);
@@ -109,9 +108,9 @@ public class P90Pickup extends AbstractTransparentComponent<String> {
if (body[1] != null)
g2d.draw(body[1]);
if (!outlineMode && componentState != ComponentState.DRAGGING) {
g2d.setColor(POLE_COLOR);
g2d.setColor(METAL_COLOR);
g2d.fill(body[3]);
g2d.setColor(color.darker());
g2d.setColor(METAL_COLOR.darker());
g2d.draw(body[3]);
}
@@ -242,7 +241,7 @@ public class P90Pickup extends AbstractTransparentComponent<String> {
g2d.setColor(BODY_COLOR.darker());
g2d.drawRoundRect((width - baseWidth) / 2, (height - baseLength) / 2, baseWidth, baseLength, radius, radius);
g2d.setColor(POLE_COLOR.darker());
g2d.setColor(METAL_COLOR);
int poleSize = 2;
int poleSpacing = 17 * width / 32;
for (int i = 0; i < 6; i++) {
diylc/diylc-library/src/org/diylc/components/guitar/SingleCoilPickup.java
+1 -1
View File
@@ -299,7 +299,7 @@ public class SingleCoilPickup extends AbstractTransparentComponent<String> {
// g2d.drawLine(width / 2, 4 * width / 32, width / 2, 4 * width / 32);
// g2d.drawLine(width / 2, height - 4 * width / 32, width / 2, height - 4 * width / 32);
g2d.setColor(METAL_COLOR.darker());
g2d.setColor(METAL_COLOR);
int poleSize = 2;
int poleSpacing = 17 * width / 32;
for (int i = 0; i < 6; i++) {
diylc/diylc-swing/library/main.jar
BIN
View File
Binary file not shown.