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 557f5e1e..f08aefac 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/AbstractPotentiometer.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/AbstractPotentiometer.java index b6151fbb..ae8bbfc4 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/AbstractPotentiometer.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/AbstractPotentiometer.java @@ -10,7 +10,7 @@ import org.diylc.core.measures.Resistance; import org.diylc.core.measures.ResistanceUnit; public abstract class AbstractPotentiometer extends - AbstractTransparentComponent { + AbstractTransparentComponent { private static final long serialVersionUID = 1L; @@ -44,25 +44,21 @@ public abstract class AbstractPotentiometer extends public boolean isControlPointSticky(int index) { return true; } + + @Override + public String getValueForDisplay() { + return resistance.toString() + " " + taper.toString(); + } @EditableProperty - public Resistance getResistance() { + @Override + public Resistance getValue() { return resistance; } - public void setResistance(Resistance resistance) { - this.resistance = resistance; - } - @Override - public PotentiometerValue getValue() { - return new PotentiometerValue(resistance, taper); - } - - @Override - public void setValue(PotentiometerValue value) { - this.resistance = value.getResistance(); - this.taper = value.getTaper(); + public void setValue(Resistance value) { + this.resistance = value; } @EditableProperty 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 327113c6..733866ea 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 @@ -57,6 +57,11 @@ public class AxialElectrolyticCapacitor extends AbstractLeadedComponent { public void setVoltage(Voltage voltage) { this.voltage = voltage; } + + @Override + public String getValueForDisplay() { + return getValue().toString() + " " + getVoltageNew().toString(); + } @EditableProperty(name = "Voltage") public org.diylc.core.measures.Voltage getVoltageNew() { 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 8f9c3689..7c7f6d2f 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 @@ -38,6 +38,11 @@ public class CapacitorSymbol extends AbstractSchematicLeadedSymbol public void setValue(Capacitance value) { this.value = value; } + + @Override + public String getValueForDisplay() { + return getValue().toString() + " " + getVoltageNew().toString(); + } @Deprecated public Voltage getVoltage() { diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/PotentiometerPanel.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/PotentiometerPanel.java index 1ee92aa8..ef3457ee 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/PotentiometerPanel.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/PotentiometerPanel.java @@ -197,7 +197,7 @@ public class PotentiometerPanel extends AbstractPotentiometer { g2d.drawString(getName(), (int) (bodyRect.getX() + x), (int) (bodyRect.getY() + y)); // Draw value. - rect = fontMetrics.getStringBounds(getValue().toString(), g2d); + rect = fontMetrics.getStringBounds(getValueForDisplay(), g2d); textHeight = (int) rect.getHeight(); textWidth = (int) rect.getWidth(); @@ -205,7 +205,7 @@ public class PotentiometerPanel extends AbstractPotentiometer { x = (panelWidth - textWidth) / 2; y = panelHeight / 2 + fontMetrics.getAscent(); - g2d.drawString(getValue().toString(), (int) (bodyRect.getX() + x), + g2d.drawString(getValueForDisplay(), (int) (bodyRect.getX() + x), (int) (bodyRect.getY() + y)); } diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/RadialCeramicDiskCapacitor.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/RadialCeramicDiskCapacitor.java index 876a800d..409bf309 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/RadialCeramicDiskCapacitor.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/RadialCeramicDiskCapacitor.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 = "Ceramic Capacitor (radial)", author = "Branislav Stojkovic", category = "Passive", creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "C", description = "Standard radial ceramic capacitor", zOrder = IDIYComponent.COMPONENT) public class RadialCeramicDiskCapacitor extends AbstractLeadedComponent { @@ -26,7 +27,10 @@ public class RadialCeramicDiskCapacitor extends AbstractLeadedComponent { public void setValue(Capacitance value) { this.value = value; } + + @Override + public String getValueForDisplay() { + return getValue().toString() + " " + getVoltageNew().toString(); + } @Deprecated public Voltage getVoltage() { 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 5da8ff4b..72aac2d9 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 @@ -47,6 +47,11 @@ public class RadialFilmCapacitor extends AbstractLeadedComponent { this.value = value; } + @Override + public String getValueForDisplay() { + return getValue().toString() + " " + getVoltageNew().toString(); + } + @Deprecated public Voltage getVoltage() { return voltage; 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 a13adbe3..b9d3feab 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 @@ -57,6 +57,11 @@ public class Resistor extends AbstractLeadedComponent { public void setValue(Resistance value) { this.value = value; } + + @Override + public String getValueForDisplay() { + return getValue().toString() + " " + getPowerNew().toString(); + } @Deprecated public Power getPower() { 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 2ed5d7ba..0e4eefec 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 @@ -38,6 +38,11 @@ public class ResistorSymbol extends AbstractSchematicLeadedSymbol { this.value = value; } + @Override + public String getValueForDisplay() { + return getValue().toString() + " " + getPowerNew().toString(); + } + @Deprecated public Power getPower() { return power;