From b454c017a2595dd1cf2b6ce767d48ba88cc8fec3 Mon Sep 17 00:00:00 2001 From: bancika Date: Mon, 27 Aug 2012 14:34:50 +0000 Subject: [PATCH] Editable pin spacing for all radial components Folded elytics --- .../diylc-library/lib/diylc-core.jar | Bin 202002 -> 202921 bytes .../passive/RadialCeramicDiskCapacitor.java | 6 +- .../passive/RadialElectrolytic.java | 103 ++++++++++++++---- .../passive/RadialFilmCapacitor.java | 21 ++-- 4 files changed, 93 insertions(+), 37 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 f08aefac5e1b09cef8df12fb2973b085d0305003..9a7df7f2bd65c6c4f83bf4a454b1585d1eeb168d 100644 GIT binary patch delta 15859 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 M5s~=>oDb3e2OX(DQ2+n{ delta 15243 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 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 409bf309..3041da50 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 @@ -5,7 +5,7 @@ import java.awt.Graphics2D; import java.awt.Shape; import java.awt.geom.Ellipse2D; -import org.diylc.components.AbstractLeadedComponent; +import org.diylc.components.AbstractRadialComponent; import org.diylc.core.CreationMethod; import org.diylc.core.IDIYComponent; import org.diylc.core.annotations.ComponentDescriptor; @@ -17,11 +17,11 @@ 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 { +public class RadialCeramicDiskCapacitor extends AbstractRadialComponent { private static final long serialVersionUID = 1L; - public static Size DEFAULT_WIDTH = new Size(1d / 2, SizeUnit.in); + public static Size DEFAULT_WIDTH = new Size(1d / 4, 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 = BODY_COLOR.darker(); 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 00446179..df4eaa6b 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 @@ -6,11 +6,12 @@ import java.awt.Shape; import java.awt.geom.Area; import java.awt.geom.Ellipse2D; import java.awt.geom.Rectangle2D; +import java.awt.geom.RoundRectangle2D; import org.diylc.appframework.miscutils.ConfigurationManager; import org.diylc.common.IPlugInPort; import org.diylc.common.ObjectCache; -import org.diylc.components.AbstractLeadedComponent; +import org.diylc.components.AbstractRadialComponent; import org.diylc.core.CreationMethod; import org.diylc.core.IDIYComponent; import org.diylc.core.Theme; @@ -24,25 +25,29 @@ 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) -public class RadialElectrolytic extends AbstractLeadedComponent { +public class RadialElectrolytic extends AbstractRadialComponent { private static final long serialVersionUID = 1L; - public static Size DEFAULT_SIZE = new Size(1d / 2, SizeUnit.in); + public static Size DEFAULT_SIZE = new Size(1d / 4, SizeUnit.in); public static Color BODY_COLOR = Color.decode("#EAADEA"); public static Color BORDER_COLOR = BODY_COLOR.darker(); public static Color MARKER_COLOR = Color.gray; public static Color TICK_COLOR = Color.white; + public static Size HEIGHT = new Size(0.4d, SizeUnit.in); + public static Size EDGE_RADIUS = new Size(1d, SizeUnit.mm); 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 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; private boolean polarized = true; + private boolean folded = false; + private Size height = HEIGHT; public RadialElectrolytic() { super(); @@ -58,7 +63,7 @@ public class RadialElectrolytic extends AbstractLeadedComponent { public void setValue(Capacitance value) { this.value = value; } - + @Override public String getValueForDisplay() { return getValue().toString() + " " + getVoltageNew().toString(); @@ -73,7 +78,7 @@ public class RadialElectrolytic extends AbstractLeadedComponent { public void setVoltage(Voltage voltage) { this.voltage = voltage; } - + @EditableProperty(name = "Voltage") public org.diylc.core.measures.Voltage getVoltageNew() { // Backward comptibility @@ -92,16 +97,18 @@ public class RadialElectrolytic extends AbstractLeadedComponent { public void drawIcon(Graphics2D g2d, int width, int height) { g2d.setColor(BODY_COLOR); int margin = 3; - Ellipse2D body = new Ellipse2D.Double(margin, margin, getClosestOdd(width - 2 * margin), - getClosestOdd(width - 2 * margin)); + Ellipse2D body = new Ellipse2D.Double(margin, margin, + getClosestOdd(width - 2 * margin), getClosestOdd(width - 2 + * margin)); g2d.fill(body); Area marker = new Area(body); - marker.subtract(new Area(new Rectangle2D.Double(margin, margin, width - 4 * margin, - getClosestOdd(width - 2 * margin)))); + marker.subtract(new Area(new Rectangle2D.Double(margin, margin, width + - 4 * margin, getClosestOdd(width - 2 * margin)))); g2d.setColor(MARKER_COLOR); g2d.fill(marker); g2d.setColor(TICK_COLOR); - g2d.drawLine(width - 2 * margin, height / 2 - 2, width - 2 * margin, height / 2 + 2); + g2d.drawLine(width - 2 * margin, height / 2 - 2, width - 2 * margin, + height / 2 + 2); g2d.setColor(BORDER_COLOR); g2d.draw(body); // g2d.setColor(COVER_COLOR.darker()); @@ -115,28 +122,50 @@ public class RadialElectrolytic extends AbstractLeadedComponent { @Override protected void decorateComponentBody(Graphics2D g2d, boolean outlineMode) { + int height = (int) getHeight().convertToPixels(); if (polarized) { int totalDiameter = getClosestOdd(getLength().convertToPixels()); if (!outlineMode) { - Area area = new Area(getBodyShape()); - area.subtract(new Area(new Rectangle2D.Double(0, 0, totalDiameter * 0.8, - totalDiameter))); - g2d.setColor(markerColor); - g2d.fill(area); + if (folded) { + Area area = new Area(getBodyShape()); + area.subtract(new Area(new Rectangle2D.Double(0, -height, + totalDiameter * 0.8, height * 2))); + g2d.setColor(markerColor); + g2d.fill(area); + } else { + Area area = new Area(getBodyShape()); + area.subtract(new Area(new Rectangle2D.Double(0, 0, + totalDiameter * 0.8, totalDiameter))); + g2d.setColor(markerColor); + g2d.fill(area); + } } Color finalTickColor; if (outlineMode) { - Theme theme = (Theme) ConfigurationManager.getInstance().readObject( - IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME); + Theme theme = (Theme) ConfigurationManager.getInstance() + .readObject(IPlugInPort.THEME_KEY, + Constants.DEFAULT_THEME); finalTickColor = theme.getOutlineColor(); } else { finalTickColor = tickColor; } g2d.setColor(finalTickColor); g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(2)); - g2d.drawLine((int) (totalDiameter * 0.9), totalDiameter / 2 - - (int) (totalDiameter * 0.05), (int) (totalDiameter * 0.9), totalDiameter / 2 - + (int) (totalDiameter * 0.05)); + if (folded) { + int tickLength = height / 7; + for (int i = 0; i < 3; i++) { + g2d.drawLine((int) (totalDiameter * 0.92), -height / 2 + + tickLength + i * tickLength * 2, + (int) (totalDiameter * 0.92), -height / 2 + + tickLength + i * tickLength * 2 + + tickLength); + } + } else { + g2d.drawLine((int) (totalDiameter * 0.9), totalDiameter / 2 + - (int) (totalDiameter * 0.05), + (int) (totalDiameter * 0.9), totalDiameter / 2 + + (int) (totalDiameter * 0.05)); + } } // int coverDiameter = getClosestOdd(totalDiameter * 3 / 4); // g2d.setColor(coverColor); @@ -200,9 +229,35 @@ public class RadialElectrolytic extends AbstractLeadedComponent { this.polarized = polarized; } + @EditableProperty + public boolean getFolded() { + return folded; + } + + public void setFolded(boolean folded) { + this.folded = folded; + } + + @EditableProperty + public Size getHeight() { + return height; + } + + public void setHeight(Size height) { + this.height = height; + } + @Override protected Shape getBodyShape() { - return new Ellipse2D.Double(0f, 0f, getClosestOdd(getLength().convertToPixels()), - getClosestOdd(getLength().convertToPixels())); + double height = (int) getHeight().convertToPixels(); + double diameter = (int) getLength().convertToPixels(); + if (folded) { + return new RoundRectangle2D.Double(0f, -height / 2 + - LEAD_THICKNESS.convertToPixels() / 2, + getClosestOdd(diameter), getClosestOdd(height), EDGE_RADIUS + .convertToPixels(), EDGE_RADIUS.convertToPixels()); + } + return new Ellipse2D.Double(0f, 0f, getClosestOdd(diameter), + getClosestOdd(diameter)); } } 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 72aac2d9..97a1f3c9 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 @@ -5,7 +5,7 @@ import java.awt.Graphics2D; import java.awt.Shape; import java.awt.geom.RoundRectangle2D; -import org.diylc.components.AbstractLeadedComponent; +import org.diylc.components.AbstractRadialComponent; import org.diylc.core.CreationMethod; import org.diylc.core.IDIYComponent; import org.diylc.core.annotations.ComponentDescriptor; @@ -17,20 +17,20 @@ 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 { +public class RadialFilmCapacitor extends AbstractRadialComponent { 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 Size DEFAULT_WIDTH = new Size(1d / 4, SizeUnit.in); + public static Size DEFAULT_HEIGHT = new Size(1d / 8, SizeUnit.in); public static Color BODY_COLOR = Color.decode("#FF8000"); 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); + private org.diylc.core.measures.Voltage voltageNew = new org.diylc.core.measures.Voltage( + 63d, VoltageUnit.V); public RadialFilmCapacitor() { super(); @@ -46,12 +46,12 @@ public class RadialFilmCapacitor extends AbstractLeadedComponent { public void setValue(Capacitance value) { this.value = value; } - + @Override public String getValueForDisplay() { return getValue().toString() + " " + getVoltageNew().toString(); } - + @Deprecated public Voltage getVoltage() { return voltage; @@ -76,7 +76,7 @@ public class RadialFilmCapacitor extends AbstractLeadedComponent { 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); @@ -100,7 +100,8 @@ public class RadialFilmCapacitor extends AbstractLeadedComponent { @Override protected Shape getBodyShape() { double radius = getWidth().convertToPixels() * 0.7; - return new RoundRectangle2D.Double(0f, 0f, getLength().convertToPixels(), + return new RoundRectangle2D.Double(0f, 0f, getLength() + .convertToPixels(), getClosestOdd(getWidth().convertToPixels()), radius, radius); } }