diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/build.xml b/ diy-layout-creator --username bancika@gmail.com/diylc-core/build.xml
index bcafc476..659dac8a 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/build.xml
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/build.xml
@@ -65,7 +65,7 @@
-
+
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/core/measures/Power.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/core/measures/Power.java
new file mode 100644
index 00000000..ed4b35f7
--- /dev/null
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/core/measures/Power.java
@@ -0,0 +1,31 @@
+package org.diylc.core.measures;
+
+public class Power extends AbstractMeasure {
+
+ private static final long serialVersionUID = 1L;
+
+ public Power() {
+ super();
+ // TODO Auto-generated constructor stub
+ }
+
+ public Power(Double value, PowerUnit unit) {
+ super(value, unit);
+ // TODO Auto-generated constructor stub
+ }
+
+ @Override
+ public Power clone() throws CloneNotSupportedException {
+ return new Power(value, unit);
+ }
+
+ public static Power parseCapacitance(String value) {
+ for (PowerUnit unit : PowerUnit.values()) {
+ if (value.toLowerCase().endsWith(unit.toString().toLowerCase())) {
+ value = value.substring(0, value.length() - unit.toString().length() - 1).trim();
+ return new Power(Double.parseDouble(value), unit);
+ }
+ }
+ throw new IllegalArgumentException("Could not parse power: " + value);
+ }
+}
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/core/measures/PowerUnit.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/core/measures/PowerUnit.java
new file mode 100644
index 00000000..ecd79c39
--- /dev/null
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/core/measures/PowerUnit.java
@@ -0,0 +1,24 @@
+package org.diylc.core.measures;
+
+public enum PowerUnit implements Unit {
+
+ MW(1e-1, "mW"), W(1, "W"), KW(1e3, "KW");
+
+ double factor;
+ String display;
+
+ private PowerUnit(double factor, String display) {
+ this.factor = factor;
+ this.display = display;
+ }
+
+ @Override
+ public double getFactor() {
+ return factor;
+ }
+
+ @Override
+ public String toString() {
+ return display;
+ }
+}
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/core/measures/Voltage.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/core/measures/Voltage.java
new file mode 100644
index 00000000..0f090635
--- /dev/null
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/core/measures/Voltage.java
@@ -0,0 +1,31 @@
+package org.diylc.core.measures;
+
+public class Voltage extends AbstractMeasure {
+
+ private static final long serialVersionUID = 1L;
+
+ public Voltage() {
+ super();
+ // TODO Auto-generated constructor stub
+ }
+
+ public Voltage(Double value, VoltageUnit unit) {
+ super(value, unit);
+ // TODO Auto-generated constructor stub
+ }
+
+ @Override
+ public Voltage clone() throws CloneNotSupportedException {
+ return new Voltage(value, unit);
+ }
+
+ public static Voltage parseCapacitance(String value) {
+ for (VoltageUnit unit : VoltageUnit.values()) {
+ if (value.toLowerCase().endsWith(unit.toString().toLowerCase())) {
+ value = value.substring(0, value.length() - unit.toString().length() - 1).trim();
+ return new Voltage(Double.parseDouble(value), unit);
+ }
+ }
+ throw new IllegalArgumentException("Could not parse voltage: " + value);
+ }
+}
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/core/measures/VoltageUnit.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/core/measures/VoltageUnit.java
new file mode 100644
index 00000000..feb9d6ce
--- /dev/null
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/core/measures/VoltageUnit.java
@@ -0,0 +1,24 @@
+package org.diylc.core.measures;
+
+public enum VoltageUnit implements Unit {
+
+ MV(1e-1, "mV"), V(1, "V"), KV(1e3, "KV");
+
+ double factor;
+ String display;
+
+ private VoltageUnit(double factor, String display) {
+ this.factor = factor;
+ this.display = display;
+ }
+
+ @Override
+ public double getFactor() {
+ return factor;
+ }
+
+ @Override
+ public String toString() {
+ return display;
+ }
+}
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/lib/diylc-core.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-library/lib/diylc-core.jar
index 28a8fbf6..d8e3cd5c 100644
Binary files a/ diy-layout-creator --username bancika@gmail.com/diylc-library/lib/diylc-core.jar and b/ diy-layout-creator --username bancika@gmail.com/diylc-library/lib/diylc-core.jar differ
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/AxialElectrolyticCapacitor.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/AxialElectrolyticCapacitor.java
index e26b115a..327113c6 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/AxialElectrolyticCapacitor.java
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/AxialElectrolyticCapacitor.java
@@ -18,6 +18,7 @@ import org.diylc.core.measures.Capacitance;
import org.diylc.core.measures.CapacitanceUnit;
import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit;
+import org.diylc.core.measures.VoltageUnit;
import org.diylc.utils.Constants;
@ComponentDescriptor(name = "Electrolytic Capacitor (axial)", author = "Branislav Stojkovic", category = "Passive", creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "C", description = "Axial electrolytic capacitor, similar to Sprague Atom, F&T, etc", zOrder = IDIYComponent.COMPONENT)
@@ -33,7 +34,10 @@ public class AxialElectrolyticCapacitor extends AbstractLeadedComponent {
@@ -26,7 +27,10 @@ public class AxialFilmCapacitor extends AbstractLeadedComponent {
public static Color BORDER_COLOR = BODY_COLOR.darker();
private Capacitance value = new Capacitance(22d, CapacitanceUnit.nF);
+ @Deprecated
private Voltage voltage = Voltage._63V;
+ private org.diylc.core.measures.Voltage voltageNew = new org.diylc.core.measures.Voltage(63d,
+ VoltageUnit.V);
public AxialFilmCapacitor() {
super();
@@ -48,15 +52,30 @@ public class AxialFilmCapacitor extends AbstractLeadedComponent {
this.value = value;
}
- @EditableProperty
+ @Deprecated
public Voltage getVoltage() {
return voltage;
}
+ @Deprecated
public void setVoltage(Voltage voltage) {
this.voltage = voltage;
}
+ @EditableProperty(name = "Voltage")
+ public org.diylc.core.measures.Voltage getVoltageNew() {
+ // Backward comptibility
+ if (voltageNew == null) {
+ voltageNew = voltage.convertToNewFormat();
+ voltage = null;
+ // Clear old value, don't need it anymore
+ }
+ return voltageNew;
+ }
+
+ public void setVoltageNew(org.diylc.core.measures.Voltage voltageNew) {
+ this.voltageNew = voltageNew;
+ }
public void drawIcon(Graphics2D g2d, int width, int height) {
g2d.rotate(-Math.PI / 4, width / 2, height / 2);
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/CapacitorSymbol.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/CapacitorSymbol.java
index bb2ae5f9..8f9c3689 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/CapacitorSymbol.java
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/CapacitorSymbol.java
@@ -13,6 +13,7 @@ import org.diylc.core.measures.Capacitance;
import org.diylc.core.measures.CapacitanceUnit;
import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit;
+import org.diylc.core.measures.VoltageUnit;
@ComponentDescriptor(name = "Capacitor (schematic symbol)", author = "Branislav Stojkovic", category = "Passive", creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "C", description = "Capacitor schematic symbol with an optional polarity sign", zOrder = IDIYComponent.COMPONENT)
public class CapacitorSymbol extends AbstractSchematicLeadedSymbol {
@@ -23,7 +24,10 @@ public class CapacitorSymbol extends AbstractSchematicLeadedSymbol
public static Size DEFAULT_WIDTH = new Size(0.15, SizeUnit.in);
private Capacitance value = new Capacitance(22d, CapacitanceUnit.nF);
+ @Deprecated
private Voltage voltage = Voltage._63V;
+ private org.diylc.core.measures.Voltage voltageNew = new org.diylc.core.measures.Voltage(63d,
+ VoltageUnit.V);
private boolean polarized = false;
@EditableProperty
@@ -35,15 +39,31 @@ public class CapacitorSymbol extends AbstractSchematicLeadedSymbol
this.value = value;
}
- @EditableProperty
+ @Deprecated
public Voltage getVoltage() {
return voltage;
}
+ @Deprecated
public void setVoltage(Voltage voltage) {
this.voltage = voltage;
}
+ @EditableProperty(name = "Voltage")
+ public org.diylc.core.measures.Voltage getVoltageNew() {
+ // Backward compatibility
+ if (voltageNew == null) {
+ voltageNew = voltage.convertToNewFormat();
+ voltage = null;
+ // Clear old value, don't need it anymore
+ }
+ return voltageNew;
+ }
+
+ public void setVoltageNew(org.diylc.core.measures.Voltage voltageNew) {
+ this.voltageNew = voltageNew;
+ }
+
@EditableProperty
public boolean getPolarized() {
return polarized;
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/Power.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/Power.java
index 18f6d77c..f925e2cb 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/Power.java
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/Power.java
@@ -1,5 +1,7 @@
package org.diylc.components.passive;
+import org.diylc.core.measures.PowerUnit;
+
public enum Power {
EIGHT("1/8W"), QUARTER("1/4W"), HALF("1/2W"), ONE("1W"), TWO("2W"), FIVE("5W"), TEN("10W"), FIFTY(
@@ -15,4 +17,40 @@ public enum Power {
public String toString() {
return label;
}
+
+ public org.diylc.core.measures.Power convertToNewFormat() {
+ org.diylc.core.measures.Power powerNew;
+ switch (this) {
+ case EIGHT:
+ powerNew = new org.diylc.core.measures.Power(1 / 8d, PowerUnit.W);
+ break;
+ case FIVE:
+ powerNew = new org.diylc.core.measures.Power(5d, PowerUnit.W);
+ break;
+ case FIFTY:
+ powerNew = new org.diylc.core.measures.Power(50d, PowerUnit.W);
+ break;
+ case HALF:
+ powerNew = new org.diylc.core.measures.Power(1 / 2d, PowerUnit.W);
+ break;
+ case HUNDRED:
+ powerNew = new org.diylc.core.measures.Power(100d, PowerUnit.W);
+ break;
+ case ONE:
+ powerNew = new org.diylc.core.measures.Power(1d, PowerUnit.W);
+ break;
+ case QUARTER:
+ powerNew = new org.diylc.core.measures.Power(1 / 4d, PowerUnit.W);
+ break;
+ case TEN:
+ powerNew = new org.diylc.core.measures.Power(10d, PowerUnit.W);
+ break;
+ case TWO:
+ powerNew = new org.diylc.core.measures.Power(2d, PowerUnit.W);
+ break;
+ default:
+ powerNew = new org.diylc.core.measures.Power(1 / 2d, PowerUnit.W);
+ }
+ return powerNew;
+ }
}
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/RadialElectrolytic.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/RadialElectrolytic.java
index b4a894b2..4ca98002 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/RadialElectrolytic.java
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/RadialElectrolytic.java
@@ -20,6 +20,7 @@ import org.diylc.core.measures.Capacitance;
import org.diylc.core.measures.CapacitanceUnit;
import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit;
+import org.diylc.core.measures.VoltageUnit;
import org.diylc.utils.Constants;
@ComponentDescriptor(name = "Electrolytic Capacitor", author = "Branislav Stojkovic", category = "Passive", creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "C", description = "Vertical mounted electrolytic capacitor, polarized or bipolar", zOrder = IDIYComponent.COMPONENT)
@@ -34,7 +35,10 @@ public class RadialElectrolytic extends AbstractLeadedComponent {
public static Color TICK_COLOR = Color.white;
private Capacitance value = new Capacitance(1d, CapacitanceUnit.uF);
+ @Deprecated
private Voltage voltage = Voltage._63V;
+ private org.diylc.core.measures.Voltage voltageNew = new org.diylc.core.measures.Voltage(63d,
+ VoltageUnit.V);
private Color markerColor = MARKER_COLOR;
private Color tickColor = TICK_COLOR;
@@ -55,14 +59,30 @@ public class RadialElectrolytic extends AbstractLeadedComponent {
this.value = value;
}
- @EditableProperty
+ @Deprecated
public Voltage getVoltage() {
return voltage;
}
+ @Deprecated
public void setVoltage(Voltage voltage) {
this.voltage = voltage;
}
+
+ @EditableProperty(name = "Voltage")
+ public org.diylc.core.measures.Voltage getVoltageNew() {
+ // Backward comptibility
+ if (voltageNew == null) {
+ voltageNew = voltage.convertToNewFormat();
+ voltage = null;
+ // Clear old value, don't need it anymore
+ }
+ return voltageNew;
+ }
+
+ public void setVoltageNew(org.diylc.core.measures.Voltage voltageNew) {
+ this.voltageNew = voltageNew;
+ }
public void drawIcon(Graphics2D g2d, int width, int height) {
g2d.setColor(BODY_COLOR);
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/RadialFilmCapacitor.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/RadialFilmCapacitor.java
index 044b7f14..5da8ff4b 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/RadialFilmCapacitor.java
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/RadialFilmCapacitor.java
@@ -14,6 +14,7 @@ import org.diylc.core.measures.Capacitance;
import org.diylc.core.measures.CapacitanceUnit;
import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit;
+import org.diylc.core.measures.VoltageUnit;
@ComponentDescriptor(name = "Film Capacitor (radial)", author = "Branislav Stojkovic", category = "Passive", creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "C", description = "Radial film capacitor, similar to Sprague Orange Drop", zOrder = IDIYComponent.COMPONENT)
public class RadialFilmCapacitor extends AbstractLeadedComponent {
@@ -26,7 +27,10 @@ public class RadialFilmCapacitor extends AbstractLeadedComponent {
public static Color BORDER_COLOR = BODY_COLOR.darker();
private Capacitance value = new Capacitance(123d, CapacitanceUnit.nF);
+ @Deprecated
private Voltage voltage = Voltage._63V;
+ private org.diylc.core.measures.Voltage voltageNew = new org.diylc.core.measures.Voltage(63d,
+ VoltageUnit.V);
public RadialFilmCapacitor() {
super();
@@ -43,16 +47,31 @@ public class RadialFilmCapacitor extends AbstractLeadedComponent {
this.value = value;
}
- @EditableProperty
+ @Deprecated
public Voltage getVoltage() {
return voltage;
}
+ @Deprecated
public void setVoltage(Voltage voltage) {
this.voltage = voltage;
}
+ @EditableProperty(name = "Voltage")
+ public org.diylc.core.measures.Voltage getVoltageNew() {
+ // Backward comptibility
+ if (voltageNew == null) {
+ voltageNew = voltage.convertToNewFormat();
+ voltage = null;
+ // Clear old value, don't need it anymore
+ }
+ return voltageNew;
+ }
+ public void setVoltageNew(org.diylc.core.measures.Voltage voltageNew) {
+ this.voltageNew = voltageNew;
+ }
+
public void drawIcon(Graphics2D g2d, int width, int height) {
g2d.rotate(-Math.PI / 4, width / 2, height / 2);
g2d.setColor(LEAD_COLOR);
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/Resistor.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/Resistor.java
index 67986e8b..b2c77313 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/Resistor.java
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/Resistor.java
@@ -13,6 +13,7 @@ import org.diylc.core.IDIYComponent;
import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty;
import org.diylc.core.annotations.PositiveMeasureValidator;
+import org.diylc.core.measures.PowerUnit;
import org.diylc.core.measures.Resistance;
import org.diylc.core.measures.ResistanceUnit;
import org.diylc.core.measures.Size;
@@ -31,7 +32,10 @@ public class Resistor extends AbstractLeadedComponent {
public static int FIRST_BAND = 4;
private Resistance value = new Resistance(123d, ResistanceUnit.K);
+ @Deprecated
private Power power = Power.HALF;
+ private org.diylc.core.measures.Power powerNew = new org.diylc.core.measures.Power(0.5,
+ PowerUnit.W);
private ResistorColorCode colorCode = ResistorColorCode._5_BAND;
public Resistor() {
@@ -54,15 +58,31 @@ public class Resistor extends AbstractLeadedComponent {
this.value = value;
}
- @EditableProperty
+ @Deprecated
public Power getPower() {
return power;
}
+ @Deprecated
public void setPower(Power power) {
this.power = power;
}
+ @EditableProperty(name = "Power rating")
+ public org.diylc.core.measures.Power getPowerNew() {
+ // Backward compatibility
+ if (powerNew == null) {
+ powerNew = power.convertToNewFormat();
+ // Clear old value, don't need it anymore
+ power = null;
+ }
+ return powerNew;
+ }
+
+ public void setPowerNew(org.diylc.core.measures.Power powerNew) {
+ this.powerNew = powerNew;
+ }
+
public void drawIcon(Graphics2D g2d, int width, int height) {
g2d.rotate(-Math.PI / 4, width / 2, height / 2);
g2d.setColor(LEAD_COLOR);
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/ResistorSymbol.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/ResistorSymbol.java
index 32c2aa0c..11b2d892 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/ResistorSymbol.java
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/ResistorSymbol.java
@@ -9,6 +9,7 @@ import org.diylc.core.CreationMethod;
import org.diylc.core.IDIYComponent;
import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.measures.PowerUnit;
import org.diylc.core.measures.Resistance;
import org.diylc.core.measures.ResistanceUnit;
import org.diylc.core.measures.Size;
@@ -23,7 +24,10 @@ public class ResistorSymbol extends AbstractSchematicLeadedSymbol {
public static Size DEFAULT_WIDTH = new Size(0.08, SizeUnit.in);
private Resistance value = new Resistance(100d, ResistanceUnit.K);
+ @Deprecated
private Power power = Power.HALF;
+ private org.diylc.core.measures.Power powerNew = new org.diylc.core.measures.Power(0.5,
+ PowerUnit.W);
@EditableProperty
public Resistance getValue() {
@@ -34,14 +38,31 @@ public class ResistorSymbol extends AbstractSchematicLeadedSymbol {
this.value = value;
}
- @EditableProperty
+ @Deprecated
public Power getPower() {
return power;
}
+ @Deprecated
public void setPower(Power power) {
this.power = power;
}
+
+ @EditableProperty(name = "Power rating")
+ public org.diylc.core.measures.Power getPowerNew() {
+ // Backward compatibility
+ if (powerNew == null) {
+ powerNew = power.convertToNewFormat();
+ // Clear old value, don't need it anymore
+ power = null;
+ }
+ return powerNew;
+ }
+
+ public void setPowerNew(org.diylc.core.measures.Power powerNew) {
+ this.powerNew = powerNew;
+ }
+
public void drawIcon(Graphics2D g2d, int width, int height) {
g2d.rotate(-Math.PI / 4, width / 2, height / 2);
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/Voltage.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/Voltage.java
index f8719b24..e27b308a 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/Voltage.java
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/Voltage.java
@@ -1,11 +1,58 @@
package org.diylc.components.passive;
+import org.diylc.core.measures.VoltageUnit;
+
public enum Voltage {
_16V, _25V, _63V, _100V, _160V, _250V, _300V, _350V, _400V, _500V, _630V, _1KV;
-
+
@Override
public String toString() {
return name().replace("_", "");
}
+
+ public org.diylc.core.measures.Voltage convertToNewFormat() {
+ org.diylc.core.measures.Voltage voltageNew;
+ switch (this) {
+ case _100V:
+ voltageNew = new org.diylc.core.measures.Voltage(100d, VoltageUnit.V);
+ break;
+ case _160V:
+ voltageNew = new org.diylc.core.measures.Voltage(160d, VoltageUnit.V);
+ break;
+ case _16V:
+ voltageNew = new org.diylc.core.measures.Voltage(16d, VoltageUnit.V);
+ break;
+ case _1KV:
+ voltageNew = new org.diylc.core.measures.Voltage(1d, VoltageUnit.KV);
+ break;
+ case _250V:
+ voltageNew = new org.diylc.core.measures.Voltage(250d, VoltageUnit.V);
+ break;
+ case _25V:
+ voltageNew = new org.diylc.core.measures.Voltage(25d, VoltageUnit.V);
+ break;
+ case _300V:
+ voltageNew = new org.diylc.core.measures.Voltage(300d, VoltageUnit.V);
+ break;
+ case _350V:
+ voltageNew = new org.diylc.core.measures.Voltage(350d, VoltageUnit.V);
+ break;
+ case _400V:
+ voltageNew = new org.diylc.core.measures.Voltage(400d, VoltageUnit.V);
+ break;
+ case _500V:
+ voltageNew = new org.diylc.core.measures.Voltage(500d, VoltageUnit.V);
+ break;
+ case _630V:
+ voltageNew = new org.diylc.core.measures.Voltage(630d, VoltageUnit.V);
+ break;
+ case _63V:
+ voltageNew = new org.diylc.core.measures.Voltage(63d, VoltageUnit.V);
+ break;
+ default:
+ voltageNew = new org.diylc.core.measures.Voltage(100d, VoltageUnit.V);
+ }
+ return voltageNew;
+ }
}
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/diylc-core.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/diylc-core.jar
index 3c936e35..d8e3cd5c 100644
Binary files a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/diylc-core.jar and b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/diylc-core.jar differ
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/library/main.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/library/main.jar
index d37a6651..0f3c3e88 100644
Binary files a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/library/main.jar and b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/library/main.jar differ
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml
index d29a1c73..7a54d190 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml
@@ -446,6 +446,10 @@
IMPROVEMENT
Allow finer grid spacing up to 0.5mm (0.02")
+
+ IMPROVEMENT
+ Do not hard-code voltage and power ratings
+
http://code.google.com/p/diy-layout-creator/downloads/list