diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar
index 9747a846..b2a63ab2 100644
Binary files a/diylc/diylc-library/lib/diylc-core.jar and b/diylc/diylc-library/lib/diylc-core.jar differ
diff --git a/diylc/diylc-library/src/org/diylc/components/electromechanical/FuseHolderPanel.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/FuseHolderPanel.java
new file mode 100644
index 00000000..6ba008bf
--- /dev/null
+++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/FuseHolderPanel.java
@@ -0,0 +1,339 @@
+/*
+
+ DIY Layout Creator (DIYLC).
+ Copyright (c) 2009-2018 held jointly by the individual authors.
+
+ This file is part of DIYLC.
+
+ DIYLC is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ DIYLC is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with DIYLC. If not, see .
+
+*/
+package org.diylc.components.electromechanical;
+
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Composite;
+import java.awt.FontMetrics;
+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.Rectangle2D;
+import java.awt.geom.RoundRectangle2D;
+
+import org.diylc.appframework.miscutils.ConfigurationManager;
+import org.diylc.common.Display;
+import org.diylc.common.IPlugInPort;
+import org.diylc.common.ObjectCache;
+import org.diylc.common.Orientation;
+import org.diylc.common.OrientationHV;
+import org.diylc.components.AbstractTransparentComponent;
+import org.diylc.components.RoundedPolygon;
+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 = "Fuse Holder", category = "Electro-Mechanical", author = "Branislav Stojkovic",
+ description = "Panel mounted fuse holder", stretchable = false, zOrder = IDIYComponent.COMPONENT,
+ instanceNamePrefix = "FH", autoEdit = false)
+public class FuseHolderPanel extends AbstractTransparentComponent {
+
+ private static final long serialVersionUID = 1L;
+
+ // common
+ private static Size SPACING = new Size(0.2d, SizeUnit.in);
+ private static Size LUG_WIDTH = new Size(4d, SizeUnit.mm);
+ private static Size LUG_THICKNESS = new Size(0.8d, SizeUnit.mm);
+ private static Size INNER_DIAMETER = new Size(0.5d, SizeUnit.in);
+ private static Size OUTER_DIAMETER = new Size(0.6d, SizeUnit.in);
+
+ private static Color BODY_COLOR = Color.decode("#555555");
+ private static Color BORDER_COLOR = BODY_COLOR.darker();
+ private static Color LABEL_COLOR = Color.white;
+
+ protected Point[] controlPoints = new Point[] {new Point(0, 0), new Point(0, 0)};
+ transient protected Area[] body;
+ protected String name;
+ protected String value = "";
+ private OrientationHV orientation = OrientationHV.VERTICAL;
+ private boolean hasFuse = false;
+ private Display display = Display.VALUE;
+
+ private Color bodyColor = BODY_COLOR;
+ private Color borderColor = BORDER_COLOR;
+ private Color labelColor = LABEL_COLOR;
+
+ public FuseHolderPanel() {
+ super();
+ updateControlPoints();
+ }
+
+ private void updateControlPoints() {
+ Point firstPoint = controlPoints[0];
+ int spacing = (int) SPACING.convertToPixels();
+
+ controlPoints[1].setLocation(firstPoint.x + (orientation == OrientationHV.HORIZONTAL ? spacing : 0), firstPoint.y + (orientation == OrientationHV.HORIZONTAL ? 0 : spacing));
+ }
+
+ @Override
+ public Point getControlPoint(int index) {
+ return controlPoints[index];
+ }
+
+ @Override
+ public boolean isControlPointSticky(int index) {
+ return true;
+ }
+
+ @Override
+ public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
+ return VisibilityPolicy.NEVER;
+ }
+
+ @Override
+ public int getControlPointCount() {
+ return controlPoints.length;
+ }
+
+ @Override
+ public void setControlPoint(Point point, int index) {
+ controlPoints[index].setLocation(point);
+ // Reset body shape.
+ body = null;
+ }
+
+ @EditableProperty
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @EditableProperty
+ @Override
+ public String getValue() {
+ return value;
+ }
+
+ @Override
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ @EditableProperty
+ public OrientationHV getOrientation() {
+ return orientation;
+ }
+
+ public void setOrientation(OrientationHV orientation) {
+ this.orientation = orientation;
+ updateControlPoints();
+ // Reset body shape.
+ body = null;
+ }
+
+ @EditableProperty(name = "Fuse")
+ public boolean getHasFuse() {
+ return hasFuse;
+ }
+
+ public void setHasFuse(boolean hasFuse) {
+ this.hasFuse = hasFuse;
+ body = null;
+ }
+
+ @Override
+ public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project,
+ IDrawingObserver drawingObserver) {
+ if (checkPointsClipped(g2d.getClip())) {
+ return;
+ }
+ Area[] body = getBody();
+ Theme theme = (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
+ // Draw body if available.
+ if (body != null) {
+ 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 : getBodyColor());
+ for (Area a : body)
+ if (a != null) {
+ g2d.fill(a);
+ break;
+ }
+ g2d.setComposite(oldComposite);
+ g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
+ Color finalBorderColor;
+ if (outlineMode) {
+ finalBorderColor =
+ componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
+ : theme.getOutlineColor();
+ } else {
+ finalBorderColor =
+ componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
+ : getBorderColor();
+ }
+ g2d.setColor(finalBorderColor);
+ for (Area a : body)
+ if (a != null)
+ g2d.draw(a);
+ }
+ // Do not track these changes because the whole switch has been tracked
+ // so far.
+ drawingObserver.stopTracking();
+
+ // Draw lugs.
+ int lugWidth = getClosestOdd((int) LUG_WIDTH.convertToPixels());
+ int lugHeight = getClosestOdd((int) LUG_THICKNESS.convertToPixels());
+
+ if (orientation == OrientationHV.HORIZONTAL) {
+ int p = lugHeight;
+ lugHeight = lugWidth;
+ lugWidth = p;
+ }
+
+ for (Point p : controlPoints) {
+ if (outlineMode) {
+ g2d.setColor(theme.getOutlineColor());
+ g2d.drawRect(p.x - lugWidth / 2, p.y - lugHeight / 2, lugWidth, lugHeight);
+ } else {
+ g2d.setColor(METAL_COLOR);
+ g2d.fillRect(p.x - lugWidth / 2, p.y - lugHeight / 2, lugWidth, lugHeight);
+ }
+ }
+
+ // Draw label.
+ g2d.setFont(project.getFont());
+ Color finalLabelColor;
+ if (outlineMode) {
+ finalLabelColor =
+ componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? LABEL_COLOR_SELECTED
+ : theme.getOutlineColor();
+ } else {
+ finalLabelColor =
+ componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? LABEL_COLOR_SELECTED
+ : labelColor;
+ }
+ g2d.setColor(finalLabelColor);
+ FontMetrics fontMetrics = g2d.getFontMetrics(g2d.getFont());
+ String label = "";
+ label = display == Display.VALUE ? getValue() : getName();
+ if (display == Display.NONE) {
+ label = "";
+ }
+ if (display == Display.BOTH) {
+ label = getName() + " " + (getValue() == null ? "" : getValue().toString());
+ }
+ Rectangle2D rect = fontMetrics.getStringBounds(label, g2d);
+ int textHeight = (int) (rect.getHeight());
+ int textWidth = (int) (rect.getWidth());
+ // Center text horizontally and vertically
+ Rectangle bounds = body[0].getBounds();
+ int x = bounds.x + (bounds.width - textWidth) / 2;
+ int y = bounds.y + (bounds.height - textHeight) / 2 + fontMetrics.getAscent();
+ g2d.drawString(label, x, y);
+ }
+
+ public Area[] getBody() {
+ if (body == null) {
+ Point firstPoint = controlPoints[0];
+ int spacing = (int) SPACING.convertToPixels();
+ int outerDiameter = (int) OUTER_DIAMETER.convertToPixels();
+ int innerDiameter = (int) INNER_DIAMETER.convertToPixels();
+
+ int dx = 0;
+ int dy = 0;
+ if (orientation == OrientationHV.HORIZONTAL)
+ dx = spacing / 2;
+ else
+ dy = spacing / 2;
+ body = new Area[2];
+ body[0] = new Area(new Ellipse2D.Double(firstPoint.x + dx - outerDiameter / 2, firstPoint.y + dy - outerDiameter / 2, outerDiameter, outerDiameter));
+ body[1] = new Area(new Ellipse2D.Double(firstPoint.x + dx - innerDiameter / 2, firstPoint.y + dy - innerDiameter / 2, innerDiameter, innerDiameter));
+ }
+ return body;
+ }
+
+ @Override
+ public void drawIcon(Graphics2D g2d, int width, int height) {
+ g2d.setColor(BODY_COLOR);
+ int margin = (int) (2f * width / 32);
+ int terminal = (int) (5f * width / 32);
+ int terminalSpacingV = width / 4;
+ Shape body = new Ellipse2D.Double(margin, margin, width - 2 * margin, height - 2 * margin);
+ g2d.fill(body);
+ g2d.setColor(BORDER_COLOR);
+ g2d.draw(body);
+ g2d.setColor(METAL_COLOR);
+ g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(2f));
+ g2d.drawLine(width / 2 - terminal / 2, height / 2 - terminalSpacingV / 2, width / 2 + terminal / 2, height / 2 - terminalSpacingV / 2);
+ g2d.drawLine(width / 2 - terminal / 2, height / 2 + terminalSpacingV / 2, width / 2 + terminal / 2, height / 2 + terminalSpacingV / 2);
+ }
+
+ @EditableProperty(name = "Body")
+ public Color getBodyColor() {
+ if (bodyColor == null)
+ bodyColor = BODY_COLOR;
+ return bodyColor;
+ }
+
+ public void setBodyColor(Color bodyColor) {
+ this.bodyColor = bodyColor;
+ }
+
+ @EditableProperty(name = "Border")
+ public Color getBorderColor() {
+ if (borderColor == null)
+ borderColor = BORDER_COLOR;
+ return borderColor;
+ }
+
+ public void setBorderColor(Color borderColor) {
+ this.borderColor = borderColor;
+ }
+
+ @EditableProperty
+ public Display getDisplay() {
+ return display;
+ }
+
+ public void setDisplay(Display display) {
+ this.display = display;
+ }
+
+ @EditableProperty
+ public Color getLabelColor() {
+ return labelColor;
+ }
+
+ public void setLabelColor(Color labelColor) {
+ this.labelColor = labelColor;
+ }
+}
diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar
index 6fb9a847..21f4c5fb 100644
Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ
diff --git a/diylc/diylc-swing/update.xml b/diylc/diylc-swing/update.xml
index 9c78a67c..cc11a652 100644
--- a/diylc/diylc-swing/update.xml
+++ b/diylc/diylc-swing/update.xml
@@ -2209,6 +2209,10 @@
NEW_FEATURE
When "High Quality Rendering" option is checked, some components are rendered with 3D shading for better looks
+
+
+ NEW_FEATURE
+ "Fuse Holder" added
NEW_FEATURE