diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar b/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar index dc6ff14f..5a66d344 100644 Binary files a/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar and b/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar differ diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/Power.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/Power.java deleted file mode 100644 index 0cc40488..00000000 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/Power.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.diylc.common; - -public enum Power { - -} diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/update.xml b/ diy-layout-creator --username bancika@gmail.com/DIYLC/update.xml index 9004ea48..f2ab8cef 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/update.xml +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/update.xml @@ -153,7 +153,11 @@ IMPROVEMENT - + Resistors can specify power handling + + + IMPROVEMENT + Capacitors can specify voltage handling NEW_FEATURE diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/AxialElectrolyticCapacitor.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/AxialElectrolyticCapacitor.java index 19db2b5d..5fb9c3c0 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/AxialElectrolyticCapacitor.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/AxialElectrolyticCapacitor.java @@ -29,6 +29,7 @@ public class AxialElectrolyticCapacitor extends AbstractLeadedComponent { public static Color BODY_COLOR = Color.decode("#FFE303"); public static Color BORDER_COLOR = BODY_COLOR.darker(); - private Capacitance value = new Capacitance(123d, CapacitanceUnit.nF); + private Capacitance value = new Capacitance(22d, CapacitanceUnit.nF); + private Voltage voltage = Voltage._63V; public AxialFilmCapacitor() { super(); @@ -41,6 +42,16 @@ public class AxialFilmCapacitor extends AbstractLeadedComponent { public void setValue(Capacitance value) { this.value = value; } + + @EditableProperty + public Voltage getVoltage() { + return voltage; + } + + public void setVoltage(Voltage voltage) { + this.voltage = voltage; + } + 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/Library/src/org/diylc/components/passive/Power.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Power.java new file mode 100644 index 00000000..18f6d77c --- /dev/null +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Power.java @@ -0,0 +1,18 @@ +package org.diylc.components.passive; + +public enum Power { + + EIGHT("1/8W"), QUARTER("1/4W"), HALF("1/2W"), ONE("1W"), TWO("2W"), FIVE("5W"), TEN("10W"), FIFTY( + "50W"), HUNDRED("100W"); + + String label; + + Power(String label) { + this.label = label; + } + + @Override + public String toString() { + return label; + } +} diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialCeramicDiskCapacitor.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialCeramicDiskCapacitor.java index a08da93c..723b4ccc 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialCeramicDiskCapacitor.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialCeramicDiskCapacitor.java @@ -25,7 +25,8 @@ public class RadialCeramicDiskCapacitor extends AbstractLeadedComponent { +public class RadialElectrolytic extends AbstractLeadedComponent { private static final long serialVersionUID = 1L; @@ -30,12 +30,13 @@ public class ElectrolyticRadial extends AbstractLeadedComponent { public static Color TICK_COLOR = Color.white; private Capacitance value = new Capacitance(1d, CapacitanceUnit.uF); + private Voltage voltage = Voltage._63V; private Color markerColor = MARKER_COLOR; private Color tickColor = TICK_COLOR; private boolean polarized = true; - public ElectrolyticRadial() { + public RadialElectrolytic() { super(); this.bodyColor = BODY_COLOR; this.borderColor = BORDER_COLOR; @@ -49,6 +50,16 @@ public class ElectrolyticRadial extends AbstractLeadedComponent { public void setValue(Capacitance value) { this.value = value; } + + @EditableProperty + public Voltage getVoltage() { + return voltage; + } + + public void setVoltage(Voltage voltage) { + this.voltage = voltage; + } + public void drawIcon(Graphics2D g2d, int width, int height) { g2d.setColor(BODY_COLOR); diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialFilmCapacitor.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialFilmCapacitor.java index 770b9fcd..044b7f14 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialFilmCapacitor.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialFilmCapacitor.java @@ -26,6 +26,7 @@ public class RadialFilmCapacitor extends AbstractLeadedComponent { public static Color BORDER_COLOR = BODY_COLOR.darker(); private Capacitance value = new Capacitance(123d, CapacitanceUnit.nF); + private Voltage voltage = Voltage._63V; public RadialFilmCapacitor() { super(); @@ -41,6 +42,16 @@ public class RadialFilmCapacitor extends AbstractLeadedComponent { public void setValue(Capacitance value) { this.value = value; } + + @EditableProperty + public Voltage getVoltage() { + return voltage; + } + + public void setVoltage(Voltage voltage) { + this.voltage = voltage; + } + 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/Library/src/org/diylc/components/passive/Resistor.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Resistor.java index dfade752..16eeb106 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Resistor.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Resistor.java @@ -29,6 +29,7 @@ public class Resistor extends AbstractLeadedComponent { public static Color BORDER_COLOR = BODY_COLOR.darker(); private Resistance value = new Resistance(123d, ResistanceUnit.K); + private Power power = Power.HALF; private ResistorColorCode colorCode = ResistorColorCode._5_BAND; public Resistor() { @@ -45,6 +46,15 @@ public class Resistor extends AbstractLeadedComponent { public void setValue(Resistance value) { this.value = value; } + + @EditableProperty + public Power getPower() { + return power; + } + + public void setPower(Power power) { + this.power = power; + } 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/Library/src/org/diylc/components/passive/ResistorSymbol.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/ResistorSymbol.java index 8c87118e..32c2aa0c 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/ResistorSymbol.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/ResistorSymbol.java @@ -23,6 +23,7 @@ public class ResistorSymbol extends AbstractSchematicLeadedSymbol { public static Size DEFAULT_WIDTH = new Size(0.08, SizeUnit.in); private Resistance value = new Resistance(100d, ResistanceUnit.K); + private Power power = Power.HALF; @EditableProperty public Resistance getValue() { @@ -32,6 +33,15 @@ public class ResistorSymbol extends AbstractSchematicLeadedSymbol { public void setValue(Resistance value) { this.value = value; } + + @EditableProperty + public Power getPower() { + return power; + } + + public void setPower(Power power) { + this.power = power; + } 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/Library/src/org/diylc/components/passive/ResistorValue.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/ResistorValue.java new file mode 100644 index 00000000..a5cb31a1 --- /dev/null +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/ResistorValue.java @@ -0,0 +1,28 @@ +package org.diylc.components.passive; + +import org.diylc.core.measures.Resistance; + +public class ResistorValue { + + private Resistance resistance; + private Power power; + + public ResistorValue(Resistance resistance, Power power) { + super(); + this.resistance = resistance; + this.power = power; + } + + public Resistance getResistance() { + return resistance; + } + + public Power getPower() { + return power; + } + + @Override + public String toString() { + return resistance.toString() + " " + power.toString(); + } +} diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Voltage.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Voltage.java new file mode 100644 index 00000000..f8719b24 --- /dev/null +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Voltage.java @@ -0,0 +1,11 @@ +package org.diylc.components.passive; + +public enum Voltage { + + _16V, _25V, _63V, _100V, _160V, _250V, _300V, _350V, _400V, _500V, _630V, _1KV; + + @Override + public String toString() { + return name().replace("_", ""); + } +}