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 1caccdca..77bac49c 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.library/org/diylc/components/Capacitor.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/AxialFilmCapacitor.java similarity index 90% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/Capacitor.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/AxialFilmCapacitor.java index 5b3130d6..5c861fa5 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/Capacitor.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/AxialFilmCapacitor.java @@ -14,7 +14,7 @@ import org.diylc.core.measures.Size; import org.diylc.core.measures.SizeUnit; @ComponentDescriptor(name = "Axial Film Capacitor", author = "bancika", category = "Passive", instanceNamePrefix = "C", desciption = "test") -public class Capacitor extends AbstractLeadedDIYComponent { +public class AxialFilmCapacitor extends AbstractLeadedDIYComponent { private static final long serialVersionUID = 1L; @@ -25,7 +25,7 @@ public class Capacitor extends AbstractLeadedDIYComponent { private Capacitance value = new Capacitance(123d, CapacitanceUnit.nF); - public Capacitor() { + public AxialFilmCapacitor() { super(); } diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/CeramicDiskCapacitor.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/CeramicDiskCapacitor.java new file mode 100644 index 00000000..670f8c05 --- /dev/null +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/CeramicDiskCapacitor.java @@ -0,0 +1,71 @@ +package org.diylc.components; + +import java.awt.Color; +import java.awt.Graphics2D; +import java.awt.Shape; +import java.awt.geom.Ellipse2D; + +import org.diylc.core.annotations.ComponentDescriptor; +import org.diylc.core.annotations.ComponentValue; +import org.diylc.core.annotations.EditableProperty; +import org.diylc.core.measures.Capacitance; +import org.diylc.core.measures.CapacitanceUnit; +import org.diylc.core.measures.Size; +import org.diylc.core.measures.SizeUnit; + +@ComponentDescriptor(name = "Ceramic Capacitor", author = "bancika", category = "Passive", instanceNamePrefix = "C", desciption = "test") +public class CeramicDiskCapacitor extends AbstractLeadedDIYComponent { + + private static final long serialVersionUID = 1L; + + public static Size DEFAULT_WIDTH = new Size(1d / 2, SizeUnit.in); + public static Size DEFAULT_HEIGHT = new Size(1d / 8, SizeUnit.in); + public static Color BODY_COLOR = Color.decode("#F0E68C"); + public static Color BORDER_COLOR = Color.decode("#B8860B"); + + private Capacitance value = new Capacitance(123d, CapacitanceUnit.nF); + + public CeramicDiskCapacitor() { + super(); + } + + @ComponentValue + @EditableProperty + public Capacitance getValue() { + return value; + } + + public void setValue(Capacitance value) { + this.value = value; + } + + public void drawIcon(Graphics2D g2d, int width, int height) { + g2d.drawString("C", 10, 10); + } + + @Override + protected Size getDefaultHeight() { + return DEFAULT_HEIGHT; + } + + @Override + protected Size getDefaultWidth() { + return DEFAULT_WIDTH; + } + + @Override + protected Color getBodyColor() { + return BODY_COLOR; + } + + @Override + protected Color getBorderColor() { + return BORDER_COLOR; + } + + @Override + protected Shape getComponentShape() { + return new Ellipse2D.Double(0f, 0f, getWidth().convertToPixels(), getHeight() + .convertToPixels()); + } +} diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/RadialFilmCapacitor.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/RadialFilmCapacitor.java new file mode 100644 index 00000000..28ff47ea --- /dev/null +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/RadialFilmCapacitor.java @@ -0,0 +1,72 @@ +package org.diylc.components; + +import java.awt.Color; +import java.awt.Graphics2D; +import java.awt.Shape; +import java.awt.geom.RoundRectangle2D; + +import org.diylc.core.annotations.ComponentDescriptor; +import org.diylc.core.annotations.ComponentValue; +import org.diylc.core.annotations.EditableProperty; +import org.diylc.core.measures.Capacitance; +import org.diylc.core.measures.CapacitanceUnit; +import org.diylc.core.measures.Size; +import org.diylc.core.measures.SizeUnit; + +@ComponentDescriptor(name = "Radial Film Capacitor", author = "bancika", category = "Passive", instanceNamePrefix = "C", desciption = "test") +public class RadialFilmCapacitor extends AbstractLeadedDIYComponent { + + private static final long serialVersionUID = 1L; + + public static Size DEFAULT_WIDTH = new Size(1d, SizeUnit.in); + public static Size DEFAULT_HEIGHT = new Size(1d / 4, SizeUnit.in); + public static Color BODY_COLOR = Color.decode("#FF9912"); + public static Color BORDER_COLOR = Color.decode("#D98719"); + + private Capacitance value = new Capacitance(123d, CapacitanceUnit.nF); + + public RadialFilmCapacitor() { + super(); + } + + @ComponentValue + @EditableProperty + public Capacitance getValue() { + return value; + } + + public void setValue(Capacitance value) { + this.value = value; + } + + public void drawIcon(Graphics2D g2d, int width, int height) { + g2d.drawString("C", 10, 10); + } + + @Override + protected Size getDefaultHeight() { + return DEFAULT_HEIGHT; + } + + @Override + protected Size getDefaultWidth() { + return DEFAULT_WIDTH; + } + + @Override + protected Color getBodyColor() { + return BODY_COLOR; + } + + @Override + protected Color getBorderColor() { + return BORDER_COLOR; + } + + @Override + protected Shape getComponentShape() { + double radius = getHeight().convertToPixels() * 0.7; + return new RoundRectangle2D.Double(0f, 0f, getWidth().convertToPixels(), getHeight() + .convertToPixels(), radius, radius); + } +}