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

added text editor next to slider

Browse Source
This commit is contained in:
bancika
2016-12-21 15:23:22 +01:00
parent d27b049110
commit ef07d109cf
9 changed files with 92 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-library/src/org/diylc/components/misc/Image.java
+3 -1
View File
@@ -19,6 +19,7 @@ import org.diylc.core.VisibilityPolicy;
import org.diylc.core.annotations.BomPolicy;
import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty;
import org.diylc.core.annotations.PercentEditor;
import com.thoughtworks.xstream.annotations.XStreamConverter;
@@ -43,7 +44,7 @@ public class Image extends AbstractTransparentComponent<Void> {
private Point point = new Point(0, 0);
@XStreamConverter(IconImageConverter.class)
private ImageIcon image = ICON;
private byte scale = 50;
private byte scale = DEFAULT_SCALE;
@Override
public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project,
@@ -108,6 +109,7 @@ public class Image extends AbstractTransparentComponent<Void> {
this.image = image;
}
@PercentEditor(_100PercentValue = 50)
@EditableProperty(defaultable = false)
public byte getScale() {
return scale;
diylc/diylc-library/src/org/diylc/components/smd/PassiveSMDComponent.java
+12 -12
View File
@@ -24,6 +24,8 @@ import org.diylc.core.Project;
import org.diylc.core.Theme;
import org.diylc.core.VisibilityPolicy;
import org.diylc.core.annotations.EditableProperty;
import org.diylc.core.annotations.PositiveMeasureValidator;
import org.diylc.core.measures.Capacitance;
import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit;
import org.diylc.utils.Constants;
@@ -165,26 +167,26 @@ public abstract class PassiveSMDComponent<T> extends AbstractTransparentComponen
case DEFAULT:
width = smdWidth;
height = smdLength;
x -= smdWidth / 2;
y -= pinSize / 2;
x = controlPoints[0].x - smdWidth / 2;
y = controlPoints[0].y - pinSize / 2;
break;
case _90:
width = smdLength;
height = smdWidth;
x -= width - pinSize / 2;
y -= smdWidth / 2;
x = controlPoints[1].x - pinSize / 2;
y = controlPoints[1].y - smdWidth / 2;
break;
case _180:
width = smdWidth;
height = smdLength;
x -= smdWidth / 2;
y -= height - pinSize / 2;
x = controlPoints[1].x - smdWidth / 2;
y = controlPoints[1].y - pinSize / 2;
break;
case _270:
width = smdLength;
height = smdWidth;
x -= pinSize / 2;
y -= smdWidth / 2;
x = controlPoints[0].x - pinSize / 2;
y = controlPoints[0].y - smdWidth / 2;
break;
default:
throw new RuntimeException("Unexpected orientation: " + orientation);
@@ -302,13 +304,11 @@ public abstract class PassiveSMDComponent<T> extends AbstractTransparentComponen
int textWidth = (int) (rect.getWidth());
do {
System.out.println("trying font size: " + g2d.getFont().getSize2D());
g2d.setFont(g2d.getFont().deriveFont(g2d.getFont().getSize2D() - 1));
fontMetrics = g2d.getFontMetrics(g2d.getFont());
rect = fontMetrics.getStringBounds(label, g2d);
textHeight = (int) (rect.getHeight());
textWidth = (int) (rect.getWidth());
System.out.println("width: " + rect.getWidth());
} while (textWidth > length && g2d.getFont().getSize2D() > 2);
double centerX = textTarget.getX() + textTarget.getWidth() / 2;
@@ -358,7 +358,7 @@ public abstract class PassiveSMDComponent<T> extends AbstractTransparentComponen
g2d.setColor(PIN_COLOR);
g2d.fill(contactArea);
}
@EditableProperty(name = "Body")
public Color getBodyColor() {
return bodyColor;
@@ -391,7 +391,7 @@ public abstract class PassiveSMDComponent<T> extends AbstractTransparentComponen
public static enum SMDSize {
_0805(new Size(1.25d, SizeUnit.mm), new Size(2.0d, SizeUnit.mm)), _1206(new Size(1.6d, SizeUnit.mm), new Size(3.2d,
_0805(new Size(0.05d, SizeUnit.in), new Size(0.08d, SizeUnit.in)), _1206(new Size(1.6d, SizeUnit.mm), new Size(3.2d,
SizeUnit.mm)), _1210(new Size(2.5d, SizeUnit.mm), new Size(3.2d, SizeUnit.mm)), _1806(new Size(1.6d,
SizeUnit.mm), new Size(4.5d, SizeUnit.mm)), _1812(new Size(3.2d, SizeUnit.mm), new Size(4.5d, SizeUnit.mm));