From cce34c9d9a3e5450084ed41ecbae0bf919badf5e Mon Sep 17 00:00:00 2001 From: bancika Date: Fri, 24 Aug 2012 13:42:22 +0000 Subject: [PATCH] Show voltage and power ratings in BOM where applicable --- .../diylc-library/lib/diylc-core.jar | Bin 201928 -> 202002 bytes .../passive/AbstractPotentiometer.java | 24 ++++++++---------- .../passive/AxialElectrolyticCapacitor.java | 5 ++++ .../passive/AxialFilmCapacitor.java | 5 ++++ .../components/passive/CapacitorSymbol.java | 5 ++++ .../passive/PotentiometerPanel.java | 4 +-- .../passive/RadialCeramicDiskCapacitor.java | 24 ++++++++++++++++++ .../passive/RadialElectrolytic.java | 5 ++++ .../passive/RadialFilmCapacitor.java | 5 ++++ .../diylc/components/passive/Resistor.java | 5 ++++ .../components/passive/ResistorSymbol.java | 5 ++++ 11 files changed, 71 insertions(+), 16 deletions(-) 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 557f5e1ecf84eb15280f30d118cba971203ab9d6..f08aefac5e1b09cef8df12fb2973b085d0305003 100644 GIT binary patch delta 12038 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 delta 11978 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 n%0Uo-?jmsJx5v~z 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;