Ability to edit color of copper trace, curved trace and solder pad at

the same time
This commit is contained in:
bancika
2017-04-19 15:32:13 +02:00
parent 54bcd99d17
commit 017afda5a4
9 changed files with 16 additions and 14 deletions
@@ -136,7 +136,6 @@ public class PropertyWrapper implements Cloneable {
final int prime = 31;
int result = 1;
result = prime * result + (defaultable ? 1231 : 1237);
result = prime * result + ((getter == null) ? 0 : getter.hashCode());
result = prime * result + ((name == null) ? 0 : name.hashCode());
result = prime * result + ((setter == null) ? 0 : setter.hashCode());
return result;
@@ -221,12 +221,12 @@ public abstract class AbstractCurvedComponent<T> extends AbstractTransparentComp
}
}
@EditableProperty
public Color getColor() {
@EditableProperty(name="Color")
public Color getLeadColor() {
return color;
}
public void setColor(Color color) {
public void setLeadColor(Color color) {
this.color = color;
}
Binary file not shown.
@@ -135,11 +135,11 @@ public class SolderPad extends AbstractComponent<Void> {
}
@EditableProperty(name = "Color")
public Color getColor() {
public Color getLeadColor() {
return color;
}
public void setColor(Color color) {
public void setLeadColor(Color color) {
this.color = color;
}
@@ -155,7 +155,7 @@ public class V1FileParser implements IOldFileParser {
SolderPad pad = new SolderPad();
pad.setName(nameAttr);
if (color != null) {
pad.setColor(color);
pad.setLeadColor(color);
}
pad.setControlPoint(convertV1CoordinatesToV3Point(referencePoint, x1Attr, y1Attr), 0);
component = pad;
@@ -197,7 +197,7 @@ public class V1FileParser implements IOldFileParser {
wire.setName(nameAttr);
String colorAttr = node.getAttributes().getNamedItem("Color").getNodeValue();
wire.setColor(parseV1Color(colorAttr));
wire.setLeadColor(parseV1Color(colorAttr));
wire.setControlPoint(point1, 0);
wire.setControlPoint(new Point(x2, y2), 1);
wire.setControlPoint(new Point(x3, y3), 2);
-1
View File
@@ -109,7 +109,6 @@
<zipfileset dir="." includes="update.xml" />
<zipfileset dir="." includes="run.sh" />
<zipfileset dir="." includes="diylc.l4j.ini" />
<zipfileset dir="." includes="associations.bat" />
<zipfileset dir="." includes="diylc.exe" />
</zip>
<zip destfile="${build.dir}/diylc-${diylc.version}-osx.zip">
Binary file not shown.
Binary file not shown.
+9 -5
View File
@@ -1648,23 +1648,23 @@
<changes>
<org.diylc.appframework.update.Change>
<changeType>NEW_FEATURE</changeType>
<description>Hold Control key to zoom with mouse wheel. Zooming tracks mouse cursor position.</description>
<description>Hold Control key to zoom with mouse wheel. Zooming tracks mouse cursor position</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>NEW_FEATURE</changeType>
<description>Ability to set project-wide default font through 'Edit Project Settings' dialog.</description>
<description>Ability to set project-wide default font through 'Edit Project Settings' dialog</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>NEW_FEATURE</changeType>
<description>Added wizard installer for Windows that associates .DIY files automatically.</description>
<description>Added wizard installer for Windows that associates .DIY files automatically</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>IMPROVEMENT</changeType>
<description>Moved config and auto-save file locations to standard user directory instead of using the app directory.</description>
<description>Moved config and auto-save file locations to standard user directory instead of using the app directory</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>IMPROVEMENT</changeType>
<description>Do not allow creating zero-length components (i.e. traces, lines, etc)</description>
<description>Do not allow creating zero-length components (e.g. traces, lines, etc)</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>IMPROVEMENT</changeType>
@@ -1674,6 +1674,10 @@
<changeType>IMPROVEMENT</changeType>
<description>Solder pads can be sent behind copper traces to allow creating white border around traces on top of a ground plane</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>IMPROVEMENT</changeType>
<description>Ability to edit color of copper trace, curved trace and solder pad at the same time</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>BUG_FIX</changeType>
<description>Component library empty if the app is installed in a folder that contains special characters in the name</description>