diff --git a/diylc/diylc-library/src/org/diylc/components/misc/PCBText.java b/diylc/diylc-library/src/org/diylc/components/misc/PCBText.java index 6db690fb..e3ee0662 100644 --- a/diylc/diylc-library/src/org/diylc/components/misc/PCBText.java +++ b/diylc/diylc-library/src/org/diylc/components/misc/PCBText.java @@ -31,6 +31,7 @@ import java.awt.geom.Rectangle2D; import org.diylc.common.HorizontalAlignment; import org.diylc.common.Orientation; +import org.diylc.common.PCBLayer; import org.diylc.common.VerticalAlignment; import org.diylc.components.AbstractComponent; import org.diylc.components.transform.TextTransformer; @@ -60,7 +61,9 @@ public class PCBText extends AbstractComponent { private Color color = LABEL_COLOR; private HorizontalAlignment horizontalAlignment = HorizontalAlignment.CENTER; private VerticalAlignment verticalAlignment = VerticalAlignment.CENTER; - private Orientation orientation = Orientation.DEFAULT; + private Orientation orientation = Orientation.DEFAULT; + + private PCBLayer layer = PCBLayer._1; @SuppressWarnings("incomplete-switch") @Override @@ -261,7 +264,7 @@ public class PCBText extends AbstractComponent { this.color = color; } - @EditableProperty(name = "Vertical alignment") + @EditableProperty(name = "Vertical Alignment") public VerticalAlignment getVerticalAlignment() { if (verticalAlignment == null) { verticalAlignment = VerticalAlignment.CENTER; @@ -273,7 +276,7 @@ public class PCBText extends AbstractComponent { this.verticalAlignment = verticalAlignment; } - @EditableProperty(name = "Horizontal alignment") + @EditableProperty(name = "Horizontal Alignment") public HorizontalAlignment getHorizontalAlignment() { if (horizontalAlignment == null) { horizontalAlignment = HorizontalAlignment.CENTER; @@ -283,6 +286,18 @@ public class PCBText extends AbstractComponent { public void setHorizontalAlignment(HorizontalAlignment alignment) { this.horizontalAlignment = alignment; + } + + @EditableProperty + public PCBLayer getLayer() { + if (layer == null) { + layer = PCBLayer._1; + } + return layer; + } + + public void setLayer(PCBLayer layer) { + this.layer = layer; } @Override diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar index dbf924a2..95d62b4f 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 62c240c8..dd78aba6 100644 --- a/diylc/diylc-swing/update.xml +++ b/diylc/diylc-swing/update.xml @@ -2348,6 +2348,22 @@ https://github.com/bancika/diy-layout-creator/releases + + + + 3 + 52 + 0 + + 2019-01-28 00:00:00.000 CET + + + + BUG_FIX + "PCB Text" components are not included in trace mask exports + + + https://github.com/bancika/diy-layout-creator/releases