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

Editable lead color; changed default lead color

Browse Source
This commit is contained in:
bancika
2012-10-09 09:47:45 +00:00
parent 5ea4ed44a4
commit 4338200088
5 changed files with 70 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diy-layout-creator --username bancika@gmail.com/diylc-library/lib/diylc-core.jar
BIN
View File
Binary file not shown.
diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/connectivity/CopperTrace.java
+8 -7
View File
@@ -25,10 +25,14 @@ public class CopperTrace extends AbstractLeadedComponent<Void> {
public static Size THICKNESS = new Size(1d, SizeUnit.mm);
public static Color COLOR = Color.black;
private Color leadColor = COLOR;
private Size thickness = THICKNESS;
private PCBLayer layer = PCBLayer._1;
public CopperTrace() {
super();
this.leadColor = COLOR;
}
@Override
public void drawIcon(Graphics2D g2d, int width, int height) {
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(3));
@@ -37,9 +41,9 @@ public class CopperTrace extends AbstractLeadedComponent<Void> {
}
@Override
protected Color getLeadColor(ComponentState componentState) {
protected Color getLeadColorForPainting(ComponentState componentState) {
return componentState == ComponentState.SELECTED
|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : leadColor;
|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : getLeadColor();
}
@Override
@@ -47,15 +51,12 @@ public class CopperTrace extends AbstractLeadedComponent<Void> {
return VisibilityPolicy.WHEN_SELECTED;
}
@Override
@EditableProperty(name = "Color")
public Color getLeadColor() {
return leadColor;
}
public void setLeadColor(Color leadColor) {
this.leadColor = leadColor;
}
@EditableProperty(name = "Width")
public Size getThickness() {
return thickness;
diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/connectivity/Jumper.java
+34 -9
View File
@@ -4,6 +4,7 @@ import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.Shape;
import org.diylc.common.Display;
import org.diylc.common.ObjectCache;
import org.diylc.components.AbstractLeadedComponent;
import org.diylc.core.ComponentState;
@@ -21,7 +22,13 @@ public class Jumper extends AbstractLeadedComponent<Void> {
public static Color COLOR = Color.blue;
private Color color = COLOR;
@Deprecated
private Color color;
public Jumper() {
super();
this.leadColor = COLOR;
}
@Override
public void drawIcon(Graphics2D g2d, int width, int height) {
@@ -34,18 +41,18 @@ public class Jumper extends AbstractLeadedComponent<Void> {
}
@Override
public Color getLeadColor(ComponentState componentState) {
public Color getLeadColorForPainting(ComponentState componentState) {
return componentState == ComponentState.SELECTED
|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : color;
|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : getLeadColor();
}
@EditableProperty
public Color getColor() {
return color;
@Override
@EditableProperty(name = "Color")
public Color getLeadColor() {
if (color != null) {
this.leadColor = color;
}
public void setColor(Color color) {
this.color = color;
return super.getLeadColor();
}
public Color getBodyColor() {
@@ -95,4 +102,22 @@ public class Jumper extends AbstractLeadedComponent<Void> {
protected Size getDefaultLength() {
return null;
}
@Deprecated
@Override
public Color getLabelColor() {
return super.getLabelColor();
}
@Deprecated
@Override
public String getName() {
return super.getName();
}
@Deprecated
@Override
public Display getDisplay() {
return super.getDisplay();
}
}
diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/connectivity/Line.java
+25 -1
View File
@@ -4,6 +4,7 @@ import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.Shape;
import org.diylc.common.Display;
import org.diylc.common.ObjectCache;
import org.diylc.components.AbstractLeadedComponent;
import org.diylc.core.ComponentState;
@@ -42,11 +43,16 @@ public class Line extends AbstractLeadedComponent<Void> {
}
@Override
public Color getLeadColor(ComponentState componentState) {
public Color getLeadColorForPainting(ComponentState componentState) {
return componentState == ComponentState.SELECTED
|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : color;
}
@Override
public Color getLeadColor() {
return super.getLeadColor();
}
@EditableProperty
public Color getColor() {
return color;
@@ -103,4 +109,22 @@ public class Line extends AbstractLeadedComponent<Void> {
protected Size getDefaultLength() {
return null;
}
@Deprecated
@Override
public Color getLabelColor() {
return super.getLabelColor();
}
@Deprecated
@Override
public String getName() {
return super.getName();
}
@Deprecated
@Override
public Display getDisplay() {
return super.getDisplay();
}
}
diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/connectivity/TraceCut.java
+2
View File
@@ -4,6 +4,7 @@ import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.Point;
import org.diylc.common.Display;
import org.diylc.common.ObjectCache;
import org.diylc.components.AbstractComponent;
import org.diylc.core.ComponentState;
@@ -126,6 +127,7 @@ public class TraceCut extends AbstractComponent<Void> {
this.borderColor = borderColor;
}
@Deprecated
@Override
public String getName() {
return super.getName();