diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java index dcc929a9..5e05bcbd 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java @@ -56,7 +56,7 @@ public class Presenter implements IPlugInPort { private static final Logger LOG = Logger.getLogger(Presenter.class); - public static final VersionNumber CURRENT_VERSION = new VersionNumber(3, 4, 1); + public static final VersionNumber CURRENT_VERSION = new VersionNumber(3, 5, 0); public static final String DEFAULTS_KEY_PREFIX = "default."; public static final List> EMPTY_SELECTION = Collections.emptyList(); @@ -1204,10 +1204,11 @@ public class Presenter implements IPlugInPort { // Skip already selected components or ones that cannot be stuck to // other components. Area area = drawingManager.getComponentArea(component); - if (newSelection.contains(component) || !component.isControlPointSticky(0) || area == null) + if (newSelection.contains(component) || !component.isControlPointSticky(0) + || area == null) continue; boolean matches = false; - for (IDIYComponent selectedComponent : this.selectedComponents) { + for (IDIYComponent selectedComponent : this.selectedComponents) { Area selectedArea = drawingManager.getComponentArea(selectedComponent); if (selectedArea == null) continue; diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/lib/diylc-core.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-library/lib/diylc-core.jar index f0005f9a..f13796cf 100644 Binary files a/ diy-layout-creator --username bancika@gmail.com/diylc-library/lib/diylc-core.jar and b/ diy-layout-creator --username bancika@gmail.com/diylc-library/lib/diylc-core.jar differ diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/electromechanical/CliffJack.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/electromechanical/CliffJack1_4.java similarity index 87% rename from diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/electromechanical/CliffJack.java rename to diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/electromechanical/CliffJack1_4.java index 231e3b02..61be8918 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/electromechanical/CliffJack.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/electromechanical/CliffJack1_4.java @@ -31,8 +31,8 @@ import org.diylc.core.measures.Size; import org.diylc.core.measures.SizeUnit; import org.diylc.utils.Constants; -@ComponentDescriptor(name = "Cliff 1/4\" Jack", category = "Electromechanical", author = "Branislav Stojkovic", description = "Cliff-style enclosed panel mount 1/4\" phono jack", stretchable = false, zOrder = IDIYComponent.COMPONENT, instanceNamePrefix = "J") -public class CliffJack extends AbstractTransparentComponent { +@ComponentDescriptor(name = "Cliff 1/4\" Jack", category = "Electromechanical", author = "Branislav Stojkovic", description = "Cliff-style closed panel mount 1/4\" phono jack", stretchable = false, zOrder = IDIYComponent.COMPONENT, instanceNamePrefix = "J") +public class CliffJack1_4 extends AbstractTransparentComponent { private static final long serialVersionUID = 1L; @@ -42,18 +42,18 @@ public class CliffJack extends AbstractTransparentComponent { private static Color BODY_COLOR = Color.decode("#666666"); private static Color NUT_COLOR = Color.decode("#999999"); private static Color BORDER_COLOR = Color.black; - private static Color LABEL_COLOR = Color.lightGray; - private static Size BODY_WIDTH = new Size(0.8d, SizeUnit.in); - private static Size BODY_LENGTH = new Size(1d, SizeUnit.in); + private static Color LABEL_COLOR = Color.white; + private static Size BODY_WIDTH = new Size(3/4d, SizeUnit.in); + private static Size BODY_LENGTH = new Size(0.9d, SizeUnit.in); private static Size TAIL_LENGTH = new Size(0.1d, SizeUnit.in); private Point[] controlPoints = new Point[] { new Point(0, 0) }; private JackType type = JackType.MONO; private Orientation orientation = Orientation.DEFAULT; - private Shape[] body; + transient private Shape[] body; private String value = ""; - public CliffJack() { + public CliffJack1_4() { super(); updateControlPoints(); } @@ -209,8 +209,21 @@ public class CliffJack extends AbstractTransparentComponent { // g2d.setPaint(oldPaint); g2d.setComposite(oldComposite); } - g2d.setColor(componentState == ComponentState.SELECTED - || componentState == ComponentState.DRAGGING ? SELECTION_COLOR : BORDER_COLOR); + + 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 + : BORDER_COLOR; + } + + g2d.setColor(finalBorderColor); for (int i = 0; i < body.length - 1; i++) { g2d.draw(body[i]); } @@ -249,17 +262,17 @@ public class CliffJack extends AbstractTransparentComponent { g2d.setColor(BODY_COLOR); g2d.fillRoundRect((width - tailWidth) / 2, height / 2, tailWidth, height / 2 - 2 * 32 - / height, 3 * 32 / width, 4 * 32 / width); + / height, 4 * 32 / width, 4 * 32 / width); g2d.setColor(BORDER_COLOR); g2d.drawRoundRect((width - tailWidth) / 2, height / 2, tailWidth, height / 2 - 2 * 32 - / height, 3 * 32 / width, 4 * 32 / width); + / height, 4 * 32 / width, 4 * 32 / width); g2d.setColor(NUT_COLOR); g2d.fillRoundRect((width - tailWidth) / 2, 2 * 32 / height, tailWidth, height / 2, - 3 * 32 / width, 4 * 32 / width); + 4 * 32 / width, 4 * 32 / width); g2d.setColor(BORDER_COLOR); g2d.drawRoundRect((width - tailWidth) / 2, 2 * 32 / height, tailWidth, height / 2, - 3 * 32 / width, 4 * 32 / width); + 4 * 32 / width, 4 * 32 / width); g2d.setColor(BODY_COLOR); g2d.fillRect((width - bodyWidth) / 2, height / 7 + 1, bodyWidth, height * 5 / 7); diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/electromechanical/ClosedJack1_4.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/electromechanical/ClosedJack1_4.java new file mode 100644 index 00000000..63f7c3d7 --- /dev/null +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/electromechanical/ClosedJack1_4.java @@ -0,0 +1,352 @@ +package org.diylc.components.electromechanical; + +import java.awt.AlphaComposite; +import java.awt.Color; +import java.awt.Composite; +import java.awt.Graphics2D; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.Shape; +import java.awt.geom.AffineTransform; +import java.awt.geom.Area; +import java.awt.geom.Ellipse2D; +import java.awt.geom.GeneralPath; + +import org.diylc.appframework.miscutils.ConfigurationManager; +import org.diylc.common.HorizontalAlignment; +import org.diylc.common.IPlugInPort; +import org.diylc.common.ObjectCache; +import org.diylc.common.Orientation; +import org.diylc.common.VerticalAlignment; +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 = "Closed 1/4\" Jack", category = "Electromechanical", author = "Branislav Stojkovic", description = "Enclosed panel mount 1/4\" phono jack", stretchable = false, zOrder = IDIYComponent.COMPONENT, instanceNamePrefix = "J") +public class ClosedJack1_4 extends AbstractTransparentComponent { + + private static final long serialVersionUID = 1L; + + private static Size SPACING = new Size(0.1d, SizeUnit.in); + private static Size LUG_WIDTH = new Size(0.1d, SizeUnit.in); + private static Size LUG_LENGTH = new Size(0.12d, SizeUnit.in); + private static Size LUG_HOLE_SIZE = new Size(1d, SizeUnit.mm); + private static Color BODY_COLOR = Color.decode("#666666"); + private static Color SHAFT_COLOR = Color.decode("#AAAAAA"); + private static Size SHAFT_LENGTH = new Size(0.25d, SizeUnit.in); + private static Size SHAFT_WIDTH = new Size(3d / 8, SizeUnit.in); + private static Color BORDER_COLOR = Color.black; + private static Color LABEL_COLOR = Color.white; + private static Size BODY_WIDTH = new Size(0.65d, SizeUnit.in); + private static Size BODY_LENGTH = new Size(0.8d, SizeUnit.in); + + private Point[] controlPoints = new Point[] { new Point(0, 0) }; + private JackType type = JackType.MONO; + private Orientation orientation = Orientation.DEFAULT; + transient private Shape[] body; + private String value = ""; + + public ClosedJack1_4() { + super(); + updateControlPoints(); + } + + private void updateControlPoints() { + // invalidate body shape + body = null; + int x = controlPoints[0].x; + int y = controlPoints[0].y; + int spacing = (int) SPACING.convertToPixels(); + int bodyLength = (int) BODY_LENGTH.convertToPixels(); + controlPoints = new Point[type == JackType.STEREO ? 3 : 2]; + + controlPoints[0] = new Point(x, y); + controlPoints[1] = new Point(x + bodyLength, y); + if (type == JackType.STEREO) { + controlPoints[2] = new Point(x, y + 2 * spacing); + } + + // Apply rotation if necessary + double angle = getAngle(); + if (angle != 0) { + AffineTransform rotation = AffineTransform.getRotateInstance(angle, x, y); + for (int i = 1; i < controlPoints.length; i++) { + rotation.transform(controlPoints[i], controlPoints[i]); + } + } + } + + private double getAngle() { + // Apply rotation if necessary + double angle; + switch (orientation) { + case _90: + angle = Math.PI / 2; + break; + case _180: + angle = Math.PI; + break; + case _270: + angle = Math.PI * 3 / 2; + break; + default: + angle = 0; + } + + return angle; + } + + public Shape[] getBody() { + if (body == null) { + body = new Shape[5]; + + // Create body. + int x = controlPoints[0].x; + int y = controlPoints[0].y; + int lugWidth = (int) LUG_WIDTH.convertToPixels(); + int lugLength = (int) LUG_LENGTH.convertToPixels(); + int lugHoleSize = (int) LUG_HOLE_SIZE.convertToPixels(); + int bodyLength = (int) BODY_LENGTH.convertToPixels(); + int bodyWidth = (int) BODY_WIDTH.convertToPixels(); + body[0] = new Area(new Rectangle(x + lugLength, y - bodyWidth / 2, bodyLength, + bodyWidth)); + + int shaftLength = (int) SHAFT_LENGTH.convertToPixels(); + int shaftWidth = (int) SHAFT_WIDTH.convertToPixels(); + Area shaft = new Area(new Rectangle(x + lugLength + bodyLength, y - shaftWidth / 2, + shaftLength, shaftWidth)); + body[1] = shaft; + + double angle = getAngle(); + AffineTransform rotation = null; + if (angle != 0) { + rotation = AffineTransform.getRotateInstance(angle, x, y); + } + + GeneralPath path = new GeneralPath(); + int step = 4; + for (int i = x + lugLength + bodyLength + step; i <= x + lugLength + bodyLength + + shaftLength; i += step) { + Point p = new Point(i, y - shaftWidth / 2 + 1); + if (rotation != null) { + rotation.transform(p, p); + } + path.moveTo(p.x, p.y); + p = new Point(i - step, y + shaftWidth / 2 - 1); + if (rotation != null) { + rotation.transform(p, p); + } + path.lineTo(p.x, p.y); + } + Area pathArea = new Area(path); + pathArea.intersect(shaft); + body[2] = path; + + // Create lugs. + Area lugs = new Area(); + + int spacing = (int) SPACING.convertToPixels(); + Point[] untransformedControlPoints = new Point[type == JackType.STEREO ? 3 : 2]; + + untransformedControlPoints[0] = new Point(x, y); + untransformedControlPoints[1] = new Point(x + bodyLength, y); + if (type == JackType.STEREO) { + untransformedControlPoints[2] = new Point(x, y + 2 * spacing); + } + + for (int i = 0; i < untransformedControlPoints.length; i++) { + Point point = untransformedControlPoints[i]; + Area lug = new Area(new Ellipse2D.Double(point.x - lugWidth / 2, point.y - lugWidth + / 2, lugWidth, lugWidth)); + lug.add(new Area( + new Rectangle(point.x, point.y - lugWidth / 2, lugLength, lugWidth))); + lug.subtract(new Area(new Ellipse2D.Double(point.x - lugHoleSize / 2, point.y + - lugHoleSize / 2, lugHoleSize, lugHoleSize))); + lugs.add(lug); + } + + body[3] = lugs; + + // Rotate everything that's of Area type, e.g. everything but lines. + if (rotation != null) { + for (Shape shape : body) { + if (shape instanceof Area) { + Area area = (Area) shape; + area.transform(rotation); + } + } + } + } + return body; + } + + @Override + public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, + Project project, IDrawingObserver drawingObserver) { + Shape[] body = getBody(); + + // Rectangle bounds = body.getBounds(); + + 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 : BODY_COLOR); + // GradientPaint gradient; + // if (orientation == Orientation.DEFAULT || orientation == + // Orientation._180) { + // gradient = new GradientPaint(bounds.x, bounds.y, BORDER_COLOR, + // bounds.x, bounds.y + // + bounds.height / 2, BODY_COLOR, true); + // } else { + // gradient = new GradientPaint(bounds.x, bounds.y, BORDER_COLOR, + // bounds.x + // + bounds.width / 2, bounds.y, BODY_COLOR, true); + // } + // Paint oldPaint = g2d.getPaint(); + // g2d.setPaint(gradient); + g2d.fill(body[0]); + g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : SHAFT_COLOR); + g2d.fill(body[1]); + g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : METAL_COLOR); + g2d.fill(body[3]); + // g2d.setPaint(oldPaint); + 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 : BORDER_COLOR; + } + + g2d.setColor(finalBorderColor); + g2d.draw(body[0]); + g2d.draw(body[1]); + if (!outlineMode) { + g2d.setColor(SHAFT_COLOR.darker()); + g2d.fill(body[2]); + g2d.draw(body[2]); + } + + // Pins are the last piece. + g2d.setColor(outlineMode ? finalBorderColor : METAL_COLOR.darker()); + g2d.draw(body[3]); + + Color finalLabelColor; + if (outlineMode) { + Theme theme = (Theme) ConfigurationManager.getInstance().readObject( + IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME); + finalLabelColor = componentState == ComponentState.SELECTED + || componentState == ComponentState.DRAGGING ? LABEL_COLOR_SELECTED : theme + .getOutlineColor(); + } else { + finalLabelColor = componentState == ComponentState.SELECTED + || componentState == ComponentState.DRAGGING ? LABEL_COLOR_SELECTED + : LABEL_COLOR; + } + g2d.setColor(finalLabelColor); + g2d.setFont(LABEL_FONT); + Rectangle bounds = body[0].getBounds(); + int centerX = bounds.x + bounds.width / 2; + int centerY = bounds.y + bounds.height / 2; + drawCenteredText(g2d, name, centerX, centerY, HorizontalAlignment.CENTER, + VerticalAlignment.CENTER); + } + + @Override + public void drawIcon(Graphics2D g2d, int width, int height) { + int bodyWidth = getClosestOdd(width * 3 / 5); + int tailWidth = getClosestOdd(width * 3 / 10); + + g2d.setColor(SHAFT_COLOR); + g2d.fillRect((width - tailWidth) / 2, 1, tailWidth, height / 2); + g2d.setColor(BORDER_COLOR); + g2d.drawRect((width - tailWidth) / 2, 1, tailWidth, height / 2); + + g2d.setColor(BODY_COLOR); + g2d.fillRect((width - bodyWidth) / 2, height / 7 + 1, bodyWidth, height * 5 / 7); + g2d.setColor(BORDER_COLOR); + g2d.drawRect((width - bodyWidth) / 2, height / 7 + 1, bodyWidth, height * 5 / 7); + + g2d.setColor(METAL_COLOR); + + g2d.fillRect(width * 7 / 16, height * 6 / 7 + 1, width / 8, height / 7 - 1); + g2d.fillRect(width * 7 / 16, height / 7 + 2, width / 8, height / 7 - 1); + } + + @Override + public int getControlPointCount() { + return controlPoints.length; + } + + @Override + public Point getControlPoint(int index) { + return controlPoints[index]; + } + + @Override + public void setControlPoint(Point point, int index) { + controlPoints[index] = point; + updateControlPoints(); + } + + @Override + public boolean isControlPointSticky(int index) { + return true; + } + + @Override + public VisibilityPolicy getControlPointVisibilityPolicy(int index) { + return VisibilityPolicy.NEVER; + } + + @EditableProperty + @Override + public String getValue() { + return value; + } + + @Override + public void setValue(String value) { + this.value = value; + } + + @EditableProperty + public JackType getType() { + return type; + } + + public void setType(JackType type) { + this.type = type; + updateControlPoints(); + } + + @EditableProperty + public Orientation getOrientation() { + return orientation; + } + + public void setOrientation(Orientation orientation) { + this.orientation = orientation; + updateControlPoints(); + } +}