mirror of
https://github.com/bancika/diy-layout-creator
synced 2026-11-11 09:42:08 +10:00
tree improvements
LP switch added
This commit is contained in:
bancika
Binary file not shown.
@@ -1,322 +1,301 @@
|
||||
// package org.diylc.components.guitar;
|
||||
//
|
||||
// import java.awt.AlphaComposite;
|
||||
// import java.awt.Color;
|
||||
// import java.awt.Composite;
|
||||
// import java.awt.Graphics2D;
|
||||
// import java.awt.Point;
|
||||
// import java.awt.Shape;
|
||||
// import java.awt.geom.AffineTransform;
|
||||
// import java.awt.geom.Area;
|
||||
// import java.awt.geom.Ellipse2D;
|
||||
// import java.awt.geom.Rectangle2D;
|
||||
// import java.awt.geom.RoundRectangle2D;
|
||||
//
|
||||
// import org.diylc.appframework.miscutils.ConfigurationManager;
|
||||
// import org.diylc.common.IPlugInPort;
|
||||
// import org.diylc.common.ObjectCache;
|
||||
// import org.diylc.common.Orientation;
|
||||
// import org.diylc.components.AbstractTransparentComponent;
|
||||
// import org.diylc.core.ComponentState;
|
||||
// import org.diylc.core.IDIYComponent;
|
||||
// import org.diylc.core.IDrawingObserver;
|
||||
// import org.diylc.core.Project;
|
||||
// import org.diylc.core.Theme;
|
||||
// import org.diylc.core.VisibilityPolicy;
|
||||
// import org.diylc.core.annotations.ComponentDescriptor;
|
||||
// import org.diylc.core.annotations.EditableProperty;
|
||||
// import org.diylc.core.measures.Size;
|
||||
// import org.diylc.core.measures.SizeUnit;
|
||||
// import org.diylc.utils.Constants;
|
||||
//
|
||||
// //@ComponentDescriptor(name = "Les Paul Switch", category = "Guitar", author =
|
||||
// "Branislav Stojkovic", description = "Les Paul-style 3 position switch", stretchable = false,
|
||||
// zOrder = IDIYComponent.COMPONENT, instanceNamePrefix = "SW")
|
||||
// public class LPSwitch extends AbstractTransparentComponent<String> {
|
||||
//
|
||||
// private static final long serialVersionUID = 1L;
|
||||
//
|
||||
// private static Color BASE_COLOR = Color.lightGray;
|
||||
// private static Color WAFER_COLOR = Color.decode("#CD8500");
|
||||
//
|
||||
// private static Size BASE_WIDTH = new Size(0.5d, SizeUnit.in);
|
||||
// private static Size BASE_LENGTH = new Size(47.5d, SizeUnit.mm);
|
||||
// private static Size WAFER_LENGTH = new Size(40d, SizeUnit.mm);
|
||||
// private static Size WAFER_SPACING = new Size(7.62d, SizeUnit.mm);
|
||||
// private static Size WAFER_THICKNESS = new Size(0.05d, SizeUnit.in);
|
||||
// private static Size HOLE_SIZE = new Size(2d, SizeUnit.mm);
|
||||
// private static Size HOLE_SPACING = new Size(41.2d, SizeUnit.mm);
|
||||
// private static Size TERMINAL_LENGTH = new Size(3d, SizeUnit.mm);
|
||||
// private static Size TERMINAL_SPACING = new Size(0.1d, SizeUnit.in);
|
||||
// private static Size TERMINAL_THICKNESS = new Size(0.02d, SizeUnit.in);
|
||||
//
|
||||
// private String value = "";
|
||||
// private Point[] controlPoints = new Point[] { new Point(0, 0), new Point(0, 0),
|
||||
// new Point(0, 0), new Point(0, 0) };
|
||||
// transient Shape[] body;
|
||||
// private Orientation orientation = Orientation.DEFAULT;
|
||||
//
|
||||
// public LPSwitch() {
|
||||
// super();
|
||||
// updateControlPoints();
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode,
|
||||
// Project project, IDrawingObserver drawingObserver) {
|
||||
// Shape[] body = getBody();
|
||||
//
|
||||
// g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
|
||||
// if (componentState != ComponentState.DRAGGING) {
|
||||
// Composite oldComposite = g2d.getComposite();
|
||||
// if (alpha < MAX_ALPHA) {
|
||||
// g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha
|
||||
// / MAX_ALPHA));
|
||||
// }
|
||||
// g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : BASE_COLOR);
|
||||
// g2d.fill(body[0]);
|
||||
// g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : WAFER_COLOR);
|
||||
// g2d.fill(body[1]);
|
||||
// g2d.setComposite(oldComposite);
|
||||
// }
|
||||
//
|
||||
// Color finalBorderColor;
|
||||
// if (outlineMode) {
|
||||
// Theme theme = (Theme) ConfigurationManager.getInstance().readObject(
|
||||
// IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
|
||||
// finalBorderColor = componentState == ComponentState.SELECTED
|
||||
// || componentState == ComponentState.DRAGGING ? SELECTION_COLOR : theme
|
||||
// .getOutlineColor();
|
||||
// } else {
|
||||
// finalBorderColor = componentState == ComponentState.SELECTED
|
||||
// || componentState == ComponentState.DRAGGING ? SELECTION_COLOR : BASE_COLOR
|
||||
// .darker();
|
||||
// }
|
||||
//
|
||||
// g2d.setColor(finalBorderColor);
|
||||
// g2d.draw(body[0]);
|
||||
//
|
||||
// if (outlineMode) {
|
||||
// Theme theme = (Theme) ConfigurationManager.getInstance().readObject(
|
||||
// IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
|
||||
// finalBorderColor = componentState == ComponentState.SELECTED
|
||||
// || componentState == ComponentState.DRAGGING ? SELECTION_COLOR : theme
|
||||
// .getOutlineColor();
|
||||
// } else {
|
||||
// finalBorderColor = componentState == ComponentState.SELECTED
|
||||
// || componentState == ComponentState.DRAGGING ? SELECTION_COLOR : WAFER_COLOR
|
||||
// .darker();
|
||||
// }
|
||||
//
|
||||
// g2d.draw(body[1]);
|
||||
//
|
||||
// g2d.setColor(METAL_COLOR);
|
||||
// g2d.fill(body[2]);
|
||||
// g2d.setColor(METAL_COLOR.darker());
|
||||
// g2d.draw(body[2]);
|
||||
// }
|
||||
//
|
||||
// public Shape[] getBody() {
|
||||
// if (body == null) {
|
||||
// body = new Shape[3];
|
||||
//
|
||||
// int x = controlPoints[0].x;
|
||||
// int y = controlPoints[0].y;
|
||||
// int baseWidth = (int) BASE_WIDTH.convertToPixels();
|
||||
// int baseLength = (int) BASE_LENGTH.convertToPixels();
|
||||
// int holeSize = getClosestOdd(HOLE_SIZE.convertToPixels());
|
||||
// int holeSpacing = (int) HOLE_SPACING.convertToPixels();
|
||||
// int waferLength = (int) WAFER_LENGTH.convertToPixels();
|
||||
// int waferSpacing = (int) WAFER_SPACING.convertToPixels();
|
||||
// int waferThickness = (int) WAFER_THICKNESS.convertToPixels();
|
||||
// int terminalSpacing = (int) TERMINAL_SPACING.convertToPixels();
|
||||
// int terminalLength = getClosestOdd(TERMINAL_LENGTH.convertToPixels());
|
||||
// int terminalWidth = getClosestOdd(TERMINAL_WIDTH.convertToPixels());
|
||||
//
|
||||
// int baseX = x - terminalLength / 2 - waferSpacing;
|
||||
// int baseY = y
|
||||
// - (baseLength - terminalSpacing * (type == LeverSwitchType.DP3T ? 7 : 12)) / 2;
|
||||
// Area baseArea = new Area(new Rectangle2D.Double(baseX, baseY, baseWidth, baseLength));
|
||||
// baseArea.subtract(new Area(new Ellipse2D.Double(baseX + baseWidth / 2 - holeSize / 2,
|
||||
// baseY + (baseLength - holeSpacing) / 2 - holeSize / 2, holeSize, holeSize)));
|
||||
// baseArea.subtract(new Area(new Ellipse2D.Double(baseX + baseWidth / 2 - holeSize / 2,
|
||||
// baseY + (baseLength - holeSpacing) / 2 - holeSize / 2 + holeSpacing, holeSize,
|
||||
// holeSize)));
|
||||
// body[0] = baseArea;
|
||||
//
|
||||
// Area waferArea = new Area(new Rectangle2D.Double(x - terminalLength / 2
|
||||
// - waferThickness / 2,
|
||||
// y - (waferLength - terminalSpacing * (type == LeverSwitchType.DP3T ? 7 : 12))
|
||||
// / 2, waferThickness, waferLength));
|
||||
//
|
||||
// if (type == LeverSwitchType._4P5T) {
|
||||
// waferArea.add(new Area(new Rectangle2D.Double(x - terminalLength / 2
|
||||
// - waferThickness / 2 + waferSpacing, y
|
||||
// - (waferLength - terminalSpacing * (type == LeverSwitchType.DP3T ? 7 : 12))
|
||||
// / 2, waferThickness, waferLength)));
|
||||
// }
|
||||
// body[1] = waferArea;
|
||||
//
|
||||
// double theta = 0;
|
||||
// // Rotate if needed
|
||||
// if (orientation != Orientation.DEFAULT) {
|
||||
// switch (orientation) {
|
||||
// case _90:
|
||||
// theta = Math.PI / 2;
|
||||
// break;
|
||||
// case _180:
|
||||
// theta = Math.PI;
|
||||
// break;
|
||||
// case _270:
|
||||
// theta = Math.PI * 3 / 2;
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// Area terminalArea = new Area();
|
||||
// for (Point point : controlPoints) {
|
||||
// Area terminal = new Area(new RoundRectangle2D.Double(point.x - terminalLength / 2,
|
||||
// point.y - terminalWidth / 2, terminalLength, terminalWidth,
|
||||
// terminalWidth / 2, terminalWidth / 2));
|
||||
// terminal.subtract(new Area(
|
||||
// new RoundRectangle2D.Double(point.x - terminalLength / 4, point.y
|
||||
// - terminalWidth / 4, terminalLength / 2, terminalWidth / 2,
|
||||
// terminalWidth / 2, terminalWidth / 2)));
|
||||
// // Rotate the terminal if needed
|
||||
// if (theta != 0) {
|
||||
// AffineTransform rotation = AffineTransform.getRotateInstance(theta, point.x,
|
||||
// point.y);
|
||||
// terminal.transform(rotation);
|
||||
// }
|
||||
// terminalArea.add(terminal);
|
||||
// }
|
||||
// body[2] = terminalArea;
|
||||
//
|
||||
// // Rotate if needed
|
||||
// if (theta != 0) {
|
||||
// AffineTransform rotation = AffineTransform.getRotateInstance(theta, x, y);
|
||||
// // Skip the last one because it's already rotated
|
||||
// for (int i = 0; i < body.length - 1; i++) {
|
||||
// Shape shape = body[i];
|
||||
// Area area = (Area) shape;
|
||||
// area.transform(rotation);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// return body;
|
||||
// }
|
||||
//
|
||||
// private void updateControlPoints() {
|
||||
// int x = controlPoints[0].x;
|
||||
// int y = controlPoints[0].y;
|
||||
// int terminalSpacing = (int) TERMINAL_SPACING.convertToPixels();
|
||||
// int baseLength = (int) BASE_LENGTH.convertToPixels();
|
||||
//
|
||||
// controlPoints[1].setLocation(x - terminalSpacing * 2 - baseLength, y - terminalSpacing);
|
||||
// controlPoints[2].setLocation(x - terminalSpacing * 2 - baseLength, y);
|
||||
// controlPoints[3].setLocation(x - terminalSpacing * 2 - baseLength, y);
|
||||
//
|
||||
// // Rotate if needed
|
||||
// if (orientation != Orientation.DEFAULT) {
|
||||
// double theta = 0;
|
||||
// switch (orientation) {
|
||||
// case _90:
|
||||
// theta = Math.PI / 2;
|
||||
// break;
|
||||
// case _180:
|
||||
// theta = Math.PI;
|
||||
// break;
|
||||
// case _270:
|
||||
// theta = Math.PI * 3 / 2;
|
||||
// break;
|
||||
// }
|
||||
// AffineTransform rotation = AffineTransform.getRotateInstance(theta, x, y);
|
||||
// for (Point point : controlPoints) {
|
||||
// rotation.transform(point, point);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void drawIcon(Graphics2D g2d, int width, int height) {
|
||||
// g2d.setClip(width / 32, width / 32, width, height);
|
||||
// g2d.setColor(BASE_COLOR);
|
||||
// g2d.fillRect(0, 0, width * 2 / 3, height);
|
||||
// g2d.setColor(BASE_COLOR.darker());
|
||||
// g2d.drawRect(0, 0, width * 2 / 3, height);
|
||||
// g2d.setColor(WAFER_COLOR);
|
||||
// g2d.fillRect(width / 8 * 3, 0, width / 8, height);
|
||||
// g2d.setColor(WAFER_COLOR.darker());
|
||||
// g2d.drawRect(width / 8 * 3, 0, width / 8, height);
|
||||
// Area terminals = new Area();
|
||||
// int terminalLength = getClosestOdd(11 * width / 32);
|
||||
// int terminalWidth = getClosestOdd(7 * width / 32);
|
||||
// Area terminal = new Area(new RoundRectangle2D.Double(width / 16 * 7, 4 * width / 32,
|
||||
// terminalLength, terminalWidth, terminalWidth / 2, terminalWidth / 2));
|
||||
// terminal.subtract(new Area(new RoundRectangle2D.Double(width / 16 * 7 + terminalLength / 4
|
||||
// + 1, 4 * width / 32 + terminalWidth / 4 + 1, terminalLength / 2, terminalWidth / 2,
|
||||
// terminalWidth / 4, terminalWidth / 4)));
|
||||
// terminals.add(terminal);
|
||||
// terminal = new Area(terminal);
|
||||
// terminal.transform(AffineTransform.getTranslateInstance(-terminalLength, terminalWidth + 2
|
||||
// * width / 32));
|
||||
// terminals.add(terminal);
|
||||
// terminal = new Area(terminal);
|
||||
// terminal.transform(AffineTransform.getTranslateInstance(terminalLength, terminalWidth + 2
|
||||
// * width / 32));
|
||||
// terminals.add(terminal);
|
||||
// g2d.setColor(METAL_COLOR);
|
||||
// g2d.fill(terminals);
|
||||
// g2d.setColor(METAL_COLOR.darker());
|
||||
// g2d.draw(terminals);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public int getControlPointCount() {
|
||||
// return controlPoints.length;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
|
||||
// return VisibilityPolicy.NEVER;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public boolean isControlPointSticky(int index) {
|
||||
// return true;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public Point getControlPoint(int index) {
|
||||
// return controlPoints[index];
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void setControlPoint(Point point, int index) {
|
||||
// this.controlPoints[index].setLocation(point);
|
||||
// // Invalidate the body
|
||||
// body = null;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public String getValue() {
|
||||
// return value;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void setValue(String value) {
|
||||
// this.value = value;
|
||||
// }
|
||||
//
|
||||
// @EditableProperty
|
||||
// public Orientation getOrientation() {
|
||||
// return orientation;
|
||||
// }
|
||||
//
|
||||
// public void setOrientation(Orientation orientation) {
|
||||
// this.orientation = orientation;
|
||||
// updateControlPoints();
|
||||
// // Invalidate the body
|
||||
// body = null;
|
||||
// }
|
||||
// }
|
||||
package org.diylc.components.guitar;
|
||||
|
||||
import java.awt.AlphaComposite;
|
||||
import java.awt.Color;
|
||||
import java.awt.Composite;
|
||||
import java.awt.Graphics2D;
|
||||
import java.awt.Point;
|
||||
import java.awt.Shape;
|
||||
import java.awt.geom.AffineTransform;
|
||||
import java.awt.geom.Area;
|
||||
import java.awt.geom.GeneralPath;
|
||||
import java.awt.geom.Rectangle2D;
|
||||
|
||||
import org.diylc.appframework.miscutils.ConfigurationManager;
|
||||
import org.diylc.common.IPlugInPort;
|
||||
import org.diylc.common.ObjectCache;
|
||||
import org.diylc.common.Orientation;
|
||||
import org.diylc.components.AbstractTransparentComponent;
|
||||
import org.diylc.core.ComponentState;
|
||||
import org.diylc.core.IDIYComponent;
|
||||
import org.diylc.core.IDrawingObserver;
|
||||
import org.diylc.core.Project;
|
||||
import org.diylc.core.Theme;
|
||||
import org.diylc.core.VisibilityPolicy;
|
||||
import org.diylc.core.annotations.ComponentDescriptor;
|
||||
import org.diylc.core.annotations.EditableProperty;
|
||||
import org.diylc.core.measures.Size;
|
||||
import org.diylc.core.measures.SizeUnit;
|
||||
import org.diylc.utils.Constants;
|
||||
|
||||
@ComponentDescriptor(name = "LP Switch", category = "Guitar", author = "Branislav Stojkovic",
|
||||
description = "Les Paul style 3 position toggle switch", stretchable = false, zOrder = IDIYComponent.COMPONENT,
|
||||
instanceNamePrefix = "SW")
|
||||
public class LPSwitch extends AbstractTransparentComponent<String> {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private static Color BASE_COLOR = Color.lightGray;
|
||||
private static Color WAFER_COLOR = Color.decode("#CD8500");
|
||||
|
||||
private static Size LENGTH = new Size(1.3d, SizeUnit.in);
|
||||
private static Size BASE_LENGTH = new Size(18d, SizeUnit.mm);
|
||||
private static Size WAFER_THICKNESS = new Size(0.05d, SizeUnit.in);
|
||||
private static Size TERMINAL_SPACING = new Size(0.2d, SizeUnit.in);
|
||||
|
||||
private String value = "";
|
||||
private Point[] controlPoints = new Point[] {new Point(0, 0), new Point(0, 0), new Point(0, 0), new Point(0, 0)};
|
||||
transient Shape[] body;
|
||||
private Orientation orientation = Orientation.DEFAULT;
|
||||
|
||||
public LPSwitch() {
|
||||
super();
|
||||
updateControlPoints();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project,
|
||||
IDrawingObserver drawingObserver) {
|
||||
Shape[] body = getBody();
|
||||
|
||||
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
|
||||
if (componentState != ComponentState.DRAGGING) {
|
||||
Composite oldComposite = g2d.getComposite();
|
||||
if (alpha < MAX_ALPHA) {
|
||||
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
|
||||
}
|
||||
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : WAFER_COLOR);
|
||||
g2d.fill(body[1]);
|
||||
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : BASE_COLOR);
|
||||
g2d.fill(body[0]);
|
||||
g2d.setComposite(oldComposite);
|
||||
}
|
||||
|
||||
Color finalBorderColor;
|
||||
|
||||
if (outlineMode) {
|
||||
Theme theme =
|
||||
(Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
|
||||
finalBorderColor =
|
||||
componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
|
||||
: theme.getOutlineColor();
|
||||
} else {
|
||||
finalBorderColor =
|
||||
componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
|
||||
: WAFER_COLOR.darker();
|
||||
}
|
||||
|
||||
g2d.setColor(finalBorderColor);
|
||||
g2d.draw(body[0]);
|
||||
|
||||
if (outlineMode) {
|
||||
Theme theme =
|
||||
(Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
|
||||
finalBorderColor =
|
||||
componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
|
||||
: theme.getOutlineColor();
|
||||
} else {
|
||||
finalBorderColor =
|
||||
componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
|
||||
: BASE_COLOR.darker();
|
||||
}
|
||||
|
||||
g2d.setColor(finalBorderColor);
|
||||
g2d.draw(body[1]);
|
||||
|
||||
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(2));
|
||||
g2d.setColor(METAL_COLOR);
|
||||
g2d.draw(body[2]);
|
||||
}
|
||||
|
||||
@SuppressWarnings("incomplete-switch")
|
||||
public Shape[] getBody() {
|
||||
if (body == null) {
|
||||
body = new Shape[3];
|
||||
|
||||
int x = controlPoints[0].x;
|
||||
int y = controlPoints[0].y;
|
||||
int baseLength = (int) BASE_LENGTH.convertToPixels();
|
||||
int length = (int) LENGTH.convertToPixels();
|
||||
int waferThickness = getClosestOdd(WAFER_THICKNESS.convertToPixels());
|
||||
|
||||
Rectangle2D ground =
|
||||
new Rectangle2D.Double(x - waferThickness / 2, y, waferThickness, baseLength + (length - baseLength) / 2);
|
||||
body[0] = new Area(ground);
|
||||
|
||||
int bodyY = y + (length - baseLength) / 2;
|
||||
|
||||
Area waferArea = new Area(new Rectangle2D.Double(x - waferThickness * 3 / 2, bodyY, waferThickness, baseLength));
|
||||
waferArea.add(new Area(new Rectangle2D.Double(x + waferThickness / 2, bodyY, waferThickness, baseLength)));
|
||||
|
||||
waferArea.add(new Area(new Rectangle2D.Double(x - waferThickness * 5 / 2, bodyY, waferThickness, baseLength)));
|
||||
waferArea.add(new Area(new Rectangle2D.Double(x + waferThickness * 3 / 2, bodyY, waferThickness, baseLength)));
|
||||
|
||||
waferArea.add(new Area(new Rectangle2D.Double(x - waferThickness * 7 / 2, bodyY, waferThickness, baseLength)));
|
||||
waferArea.add(new Area(new Rectangle2D.Double(x + waferThickness * 5 / 2, bodyY, waferThickness, baseLength)));
|
||||
|
||||
body[1] = waferArea;
|
||||
|
||||
double theta = 0;
|
||||
// Rotate if needed
|
||||
if (orientation != Orientation.DEFAULT) {
|
||||
switch (orientation) {
|
||||
case _90:
|
||||
theta = Math.PI / 2;
|
||||
break;
|
||||
case _180:
|
||||
theta = Math.PI;
|
||||
break;
|
||||
case _270:
|
||||
theta = Math.PI * 3 / 2;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
int terminalSpacing = (int) TERMINAL_SPACING.convertToPixels();
|
||||
|
||||
GeneralPath terminalPath = new GeneralPath(GeneralPath.WIND_EVEN_ODD);
|
||||
terminalPath.moveTo(x - waferThickness * 3 / 2, bodyY);
|
||||
terminalPath.lineTo(x - waferThickness * 3 / 2, bodyY + baseLength);
|
||||
terminalPath.lineTo(x, y + length);
|
||||
|
||||
terminalPath.moveTo(x + waferThickness * 3 / 2, bodyY);
|
||||
terminalPath.lineTo(x + waferThickness * 3 / 2, bodyY + baseLength);
|
||||
terminalPath.lineTo(x, y + length);
|
||||
|
||||
terminalPath.moveTo(x - waferThickness * 5 / 2, bodyY);
|
||||
terminalPath.lineTo(x - waferThickness * 5 / 2, bodyY + baseLength);
|
||||
terminalPath.lineTo(x - terminalSpacing, y + length);
|
||||
|
||||
terminalPath.moveTo(x + waferThickness * 5 / 2, bodyY);
|
||||
terminalPath.lineTo(x + waferThickness * 5 / 2, bodyY + baseLength);
|
||||
terminalPath.lineTo(x + terminalSpacing, y + length);
|
||||
body[2] = terminalPath;
|
||||
|
||||
// Rotate if needed
|
||||
if (theta != 0) {
|
||||
AffineTransform rotation = AffineTransform.getRotateInstance(theta, x, y);
|
||||
// Skip the last one because it's already rotated
|
||||
for (int i = 0; i < body.length; i++) {
|
||||
Shape shape = body[i];
|
||||
if (shape instanceof Area) {
|
||||
Area area = (Area) shape;
|
||||
area.transform(rotation);
|
||||
} else if (shape instanceof GeneralPath) {
|
||||
GeneralPath path = (GeneralPath) shape;
|
||||
path.transform(rotation);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return body;
|
||||
}
|
||||
|
||||
@SuppressWarnings("incomplete-switch")
|
||||
private void updateControlPoints() {
|
||||
int x = controlPoints[0].x;
|
||||
int y = controlPoints[0].y;
|
||||
int terminalSpacing = (int) TERMINAL_SPACING.convertToPixels();
|
||||
int length = (int) LENGTH.convertToPixels();
|
||||
|
||||
controlPoints[1].setLocation(x - terminalSpacing, y + length);
|
||||
controlPoints[2].setLocation(x, y + length);
|
||||
controlPoints[3].setLocation(x + terminalSpacing, y + length);
|
||||
|
||||
// Rotate if needed
|
||||
if (orientation != Orientation.DEFAULT) {
|
||||
double theta = 0;
|
||||
switch (orientation) {
|
||||
case _90:
|
||||
theta = Math.PI / 2;
|
||||
break;
|
||||
case _180:
|
||||
theta = Math.PI;
|
||||
break;
|
||||
case _270:
|
||||
theta = Math.PI * 3 / 2;
|
||||
break;
|
||||
}
|
||||
AffineTransform rotation = AffineTransform.getRotateInstance(theta, x, y);
|
||||
for (Point point : controlPoints) {
|
||||
rotation.transform(point, point);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawIcon(Graphics2D g2d, int width, int height) {
|
||||
g2d.rotate(Math.PI / 4, width / 2, height / 2);
|
||||
int baseLength = 20 * width / 32;
|
||||
|
||||
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(3f));
|
||||
g2d.setColor(BASE_COLOR);
|
||||
g2d.drawLine(width / 2, 0, width / 2, baseLength + (width - baseLength) / 2);
|
||||
g2d.setColor(WAFER_COLOR);
|
||||
g2d.fillRect(8 * width / 32, (width - baseLength) / 2, 16 * width / 32, baseLength);
|
||||
g2d.setColor(METAL_COLOR);
|
||||
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1f));
|
||||
g2d.drawLine(width / 2 - 2, (width - baseLength) / 2, width / 2 - 2, baseLength + (width - baseLength) / 2);
|
||||
g2d.drawLine(width / 2 + 2, (width - baseLength) / 2, width / 2 + 2, baseLength + (width - baseLength) / 2);
|
||||
g2d.drawLine(width / 2 - 5, (width - baseLength) / 2, width / 2 - 5, baseLength + (width - baseLength) / 2);
|
||||
g2d.drawLine(width / 2 + 5, (width - baseLength) / 2, width / 2 + 5, baseLength + (width - baseLength) / 2);
|
||||
int dx = 2 * width / 32;
|
||||
int dy = 4 * width / 32;
|
||||
g2d.drawLine(width / 2 - 2, baseLength + (width - baseLength) / 2, width / 2 - 2 + dx, baseLength
|
||||
+ (width - baseLength) / 2 + dy);
|
||||
g2d.drawLine(width / 2 + 2, baseLength + (width - baseLength) / 2, width / 2 + 2 - dx, baseLength
|
||||
+ (width - baseLength) / 2 + dy);
|
||||
|
||||
g2d.drawLine(width / 2 - 5, baseLength + (width - baseLength) / 2, width / 2 - 5 - dx, baseLength + (width - baseLength) / 2 + dy);
|
||||
g2d.drawLine(width / 2 + 5, baseLength + (width - baseLength) / 2, width / 2 + 5 + dx, baseLength + (width - baseLength) / 2 + dy);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getControlPointCount() {
|
||||
return controlPoints.length;
|
||||
}
|
||||
|
||||
@Override
|
||||
public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
|
||||
return VisibilityPolicy.NEVER;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isControlPointSticky(int index) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Point getControlPoint(int index) {
|
||||
return controlPoints[index];
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setControlPoint(Point point, int index) {
|
||||
this.controlPoints[index].setLocation(point);
|
||||
// Invalidate the body
|
||||
body = null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setValue(String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
@EditableProperty
|
||||
public Orientation getOrientation() {
|
||||
return orientation;
|
||||
}
|
||||
|
||||
public void setOrientation(Orientation orientation) {
|
||||
this.orientation = orientation;
|
||||
updateControlPoints();
|
||||
// Invalidate the body
|
||||
body = null;
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -34,8 +34,6 @@ import javax.swing.event.DocumentEvent;
|
||||
import javax.swing.event.DocumentListener;
|
||||
import javax.swing.event.PopupMenuEvent;
|
||||
import javax.swing.event.PopupMenuListener;
|
||||
import javax.swing.event.TreeSelectionEvent;
|
||||
import javax.swing.event.TreeSelectionListener;
|
||||
import javax.swing.tree.DefaultMutableTreeNode;
|
||||
import javax.swing.tree.DefaultTreeCellRenderer;
|
||||
import javax.swing.tree.DefaultTreeModel;
|
||||
@@ -60,6 +58,7 @@ public class TreePanel extends JPanel {
|
||||
|
||||
private DefaultTreeModel treeModel;
|
||||
private JTree tree;
|
||||
private JScrollPane treeScroll;
|
||||
private JTextField searchField;
|
||||
private DefaultMutableTreeNode recentNode;
|
||||
private List<String> recentComponents;
|
||||
@@ -77,17 +76,17 @@ public class TreePanel extends JPanel {
|
||||
gbc.gridy = 0;
|
||||
gbc.fill = GridBagConstraints.HORIZONTAL;
|
||||
gbc.weighty = 0;
|
||||
gbc.gridwidth = 1;
|
||||
|
||||
add(getSearchField(), gbc);
|
||||
|
||||
gbc.gridy++;
|
||||
|
||||
gbc.fill = GridBagConstraints.BOTH;
|
||||
gbc.weighty = 1;
|
||||
gbc.weightx = 1;
|
||||
|
||||
JScrollPane scroll = new JScrollPane(getTree());
|
||||
scroll.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
|
||||
add(scroll, gbc);
|
||||
add(getTreeScroll(), gbc);
|
||||
|
||||
setPreferredSize(new Dimension(240, 200));
|
||||
|
||||
@@ -109,6 +108,14 @@ public class TreePanel extends JPanel {
|
||||
getTree().expandRow(0);
|
||||
}
|
||||
|
||||
public JScrollPane getTreeScroll() {
|
||||
if (treeScroll == null) {
|
||||
treeScroll = new JScrollPane(getTree());
|
||||
treeScroll.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
|
||||
}
|
||||
return treeScroll;
|
||||
}
|
||||
|
||||
public DefaultMutableTreeNode getRecentNode() {
|
||||
if (this.recentNode == null) {
|
||||
this.recentNode = new DefaultMutableTreeNode(new Payload("(Recently Used)"), true);
|
||||
@@ -170,31 +177,39 @@ public class TreePanel extends JPanel {
|
||||
tree.setCellRenderer(new ComponentCellRenderer());
|
||||
tree.setRowHeight(0);
|
||||
ToolTipManager.sharedInstance().registerComponent(tree);
|
||||
tree.addTreeSelectionListener(new TreeSelectionListener() {
|
||||
|
||||
@Override
|
||||
public void valueChanged(TreeSelectionEvent e) {
|
||||
Object c = e.getPath().getLastPathComponent();
|
||||
if (c != null && c.getClass().equals(DefaultMutableTreeNode.class)) {
|
||||
DefaultMutableTreeNode node = (DefaultMutableTreeNode) c;
|
||||
Object obj = node.getUserObject();
|
||||
if (obj != null && obj.getClass().equals(Payload.class)) {
|
||||
Payload payload = (Payload) obj;
|
||||
plugInPort.setNewComponentTypeSlot(payload.getComponentType(), null);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
// tree.addTreeSelectionListener(new TreeSelectionListener() {
|
||||
//
|
||||
// @Override
|
||||
// public void valueChanged(TreeSelectionEvent e) {
|
||||
// Object c = e.getPath().getLastPathComponent();
|
||||
// if (c != null && c.getClass().equals(DefaultMutableTreeNode.class)) {
|
||||
// DefaultMutableTreeNode node = (DefaultMutableTreeNode) c;
|
||||
// Object obj = node.getUserObject();
|
||||
// if (obj != null && obj.getClass().equals(Payload.class)) {
|
||||
// Payload payload = (Payload) obj;
|
||||
// plugInPort.setNewComponentTypeSlot(payload.getComponentType(), null);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// });
|
||||
|
||||
tree.addMouseListener(new MouseAdapter() {
|
||||
|
||||
@Override
|
||||
public void mouseClicked(MouseEvent e) {
|
||||
|
||||
if (SwingUtilities.isRightMouseButton(e)) {
|
||||
int row = tree.getClosestRowForLocation(e.getX(), e.getY());
|
||||
tree.setSelectionRow(row);
|
||||
getPopup().show(e.getComponent(), e.getX(), e.getY());
|
||||
} else {
|
||||
TreePath path = tree.getClosestPathForLocation(e.getX(), e.getY());
|
||||
DefaultMutableTreeNode node = (DefaultMutableTreeNode) path.getLastPathComponent();
|
||||
if (node != null && node.getUserObject() != null) {
|
||||
Payload payload = (Payload) node.getUserObject();
|
||||
if (payload.getComponentType() != null) {
|
||||
plugInPort.setNewComponentTypeSlot(payload.getComponentType(), null);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1458,14 +1458,22 @@
|
||||
<changeType>NEW_FEATURE</changeType>
|
||||
<description>Searchable toolbox tree instead of the old toolbar (can be changed from "Config" menu)</description>
|
||||
</org.diylc.appframework.update.Change>
|
||||
<org.diylc.appframework.update.Change>
|
||||
<changeType>NEW_FEATURE</changeType>
|
||||
<description>LP-style switch added</description>
|
||||
</org.diylc.appframework.update.Change>
|
||||
<org.diylc.appframework.update.Change>
|
||||
<changeType>NEW_FEATURE</changeType>
|
||||
<description>P-90 pickup in both "dog ear" and "soap bar" variations added</description>
|
||||
</org.diylc.appframework.update.Change>
|
||||
<org.diylc.appframework.update.Change>
|
||||
<changeType>NEW_FEATURE</changeType>
|
||||
<description>Mini humbucker pickup added</description>
|
||||
<description>Mini humbucker pickup added as a variation of Humbucker pickup</description>
|
||||
</org.diylc.appframework.update.Change>
|
||||
<org.diylc.appframework.update.Change>
|
||||
<changeType>IMPROVEMENT</changeType>
|
||||
<description>Improved guitar pickup look</description>
|
||||
</org.diylc.appframework.update.Change>
|
||||
<org.diylc.appframework.update.Change>
|
||||
<changeType>BUG_FIX</changeType>
|
||||
<description>Fixed broken links in the Help menu</description>
|
||||
|
||||
Reference in New Issue
Block a user