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

change tube color

Browse Source
This commit is contained in:
bancika
2017-01-11 15:57:15 +01:00
parent c945dc89ad
commit c64c9fb5b2
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-library/src/org/diylc/components/tube/TubeSocket.java
+18 -5
View File
@@ -35,7 +35,7 @@ public class TubeSocket extends AbstractTransparentComponent<String> {
private static final long serialVersionUID = 1L;
private static Color BODY_COLOR = Color.decode("#F7F7EF");
private static Color BORDER_COLOR = Color.decode("#8E8E38");
// private static Color BORDER_COLOR = Color.decode("#8E8E38");
public static Color PIN_COLOR = Color.decode("#00B2EE");
public static Color PIN_BORDER_COLOR = PIN_COLOR.darker();
public static Size PIN_SIZE = new Size(1d, SizeUnit.mm);
@@ -47,6 +47,7 @@ public class TubeSocket extends AbstractTransparentComponent<String> {
private Orientation orientation;
// private Mount mount = Mount.CHASSIS;
private int angle;
private Color color = BODY_COLOR;
private Point[] controlPoints = new Point[] {new Point(0, 0)};
@@ -107,6 +108,18 @@ public class TubeSocket extends AbstractTransparentComponent<String> {
// Reset body shape
body = null;
}
@EditableProperty
public Color getColor() {
if (color == null) {
color = BODY_COLOR;
}
return color;
}
public void setColor(Color color) {
this.color = color;
}
// @EditableProperty
// public Mount getMount() {
@@ -207,7 +220,7 @@ public class TubeSocket extends AbstractTransparentComponent<String> {
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
}
if (componentState != ComponentState.DRAGGING) {
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : BODY_COLOR);
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : getColor());
g2d.fill(body);
}
g2d.setComposite(oldComposite);
@@ -221,7 +234,7 @@ public class TubeSocket extends AbstractTransparentComponent<String> {
} else {
finalBorderColor =
componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
: BORDER_COLOR;
: getColor().darker();
}
g2d.setColor(finalBorderColor);
g2d.draw(body);
@@ -242,9 +255,9 @@ public class TubeSocket extends AbstractTransparentComponent<String> {
Area area = new Area(new Ellipse2D.Double(1, 1, width - 2, width - 2));
int center = width / 2;
area.subtract(new Area(new Ellipse2D.Double(center - 2, center - 2, 5, 5)));
g2d.setColor(BODY_COLOR);
g2d.setColor(getColor());
g2d.fill(area);
g2d.setColor(BORDER_COLOR);
g2d.setColor(getColor().darker());
g2d.draw(area);
int radius = width / 2 - 6;
diylc/diylc-swing/library/main.jar
BIN
View File
Binary file not shown.
diylc/diylc-swing/update.xml
+1 -1
View File
@@ -1564,7 +1564,7 @@
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>IMPROVEMENT</changeType>
<description>Ability to rotate tube sockets for arbitrary angle</description>
<description>Ability to rotate tube sockets for arbitrary angle and to change color</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>IMPROVEMENT</changeType>