diff --git a/diylc/diylc-library/src/org/diylc/components/AbstractRadialComponent.java b/diylc/diylc-library/src/org/diylc/components/AbstractRadialComponent.java index 888f8de8..76f1d5e8 100644 --- a/diylc/diylc-library/src/org/diylc/components/AbstractRadialComponent.java +++ b/diylc/diylc-library/src/org/diylc/components/AbstractRadialComponent.java @@ -47,7 +47,7 @@ public abstract class AbstractRadialComponent extends AbstractLeadedComponent return (int) getPinSpacing().convertToPixels(); } - @EditableProperty(name = "Pin Spacing") + @EditableProperty(name = "Lead Spacing") public Size getPinSpacing() { if (pinSpacing == null) { pinSpacing = PIN_SPACING; diff --git a/diylc/diylc-library/src/org/diylc/components/passive/AbstractFilmCapacitor.java b/diylc/diylc-library/src/org/diylc/components/passive/AbstractFilmCapacitor.java index 6f701256..67d36321 100644 --- a/diylc/diylc-library/src/org/diylc/components/passive/AbstractFilmCapacitor.java +++ b/diylc/diylc-library/src/org/diylc/components/passive/AbstractFilmCapacitor.java @@ -46,6 +46,7 @@ public abstract class AbstractFilmCapacitor extends AbstractLeadedComponent. + * + */ +package org.diylc.components.passive; + +import java.awt.Color; +import java.text.DecimalFormat; +import java.text.NumberFormat; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import org.diylc.core.measures.Capacitance; +import org.diylc.core.measures.Size; +import org.diylc.core.measures.SizeUnit; +import org.diylc.core.measures.Voltage; +import org.diylc.presenter.DatasheetService; + +public class CapacitorDatasheetService { + + private static final double TOLERANCE = 10d; + + private static CapacitorDatasheetService instance; + + private static NumberFormat format = new DecimalFormat("##.###"); + + private Map cache = new HashMap(); + + public static CapacitorDatasheetService getInstance() { + if (instance == null) { + instance = new CapacitorDatasheetService(); + } + return instance; + } + + public CapacitorDatasheet lookup(Class clazz, String key, Voltage voltage, Capacitance value) { + return lookup(clazz, key, voltage, value, null); + } + + public CapacitorDatasheet lookup(Class clazz, String key, Voltage voltage, Capacitance value, + Boolean polarized) { + + String lookupKey = key + "|" + format.format(voltage.getNormalizedValue()) + " VDC" + + (Optional.ofNullable(polarized).map(p -> p ? "" : " NP").orElse("")); + + String cacheKey = clazz.getName() + lookupKey + "|" + format.format(value.getNormalizedValue()); + + boolean isRadial = clazz.getName().contains("Radial"); + + return cache.computeIfAbsent(cacheKey, k -> { + String[] lookup = DatasheetService.getInstance().lookup(clazz, TOLERANCE, lookupKey, + value.getNormalizedValue()); + + if (lookup != null) { + return parseCapacitorDatasheet(isRadial, lookup); + } + return null; + }); + } + + public static CapacitorDatasheet parseCapacitorDatasheet(boolean isRadial, String[] lookup) { + Size length = new Size(Double.parseDouble(lookup[3]), SizeUnit.mm); + Size width = new Size(Double.parseDouble(lookup[4]), SizeUnit.mm); + + int i = 5; + Size leadSpacing = null; + if (isRadial && lookup[5].length() > 0) { + leadSpacing = new Size(Double.parseDouble(lookup[i]), SizeUnit.mm); + i++; + } + + Color bodyColor = null; + if (lookup.length > i && lookup[i].length() == 7) + bodyColor = Color.decode(lookup[i]); + i++; + Color borderColor = null; + if (lookup.length > i && lookup[i].length() == 7) + borderColor = Color.decode(lookup[i]); + i++; + Color labelColor = null; + if (lookup.length > i && lookup[i].length() == 7) + labelColor = Color.decode(lookup[i]); + i++; + Color markerColor = null; + if (lookup.length > i && lookup[i].length() == 7) + markerColor = Color.decode(lookup[i]); + i++; + Color tickColor = null; + if (lookup.length > i && lookup[i].length() == 7) + tickColor = Color.decode(lookup[i]); + + return new CapacitorDatasheet(length, width, leadSpacing, bodyColor, borderColor, labelColor, markerColor, tickColor); + } + + public static class CapacitorDatasheet { + private Size length; + private Size width; + private Color bodyColor; + private Color borderColor; + private Color labelColor; + private Color markerColor; + private Color tickColor; + private Size leadSpacing; + + public CapacitorDatasheet(Size length, Size width, Size leadSpacing, Color bodyColor, + Color borderColor, Color labelColor, Color markerColor, Color tickColor) { + super(); + this.length = length; + this.width = width; + this.leadSpacing = leadSpacing; + this.bodyColor = bodyColor; + this.borderColor = borderColor; + this.labelColor = labelColor; + this.markerColor = markerColor; + this.tickColor = tickColor; + } + + public CapacitorDatasheet(Size length, Size diameter) { + super(); + this.length = length; + this.width = diameter; + } + + public Size getLength() { + return length; + } + + public Size getWidth() { + return width; + } + + public Size getLeadSpacing() { + return leadSpacing; + } + + public Color getBodyColor() { + return bodyColor; + } + + public Color getBorderColor() { + return borderColor; + } + + public Color getLabelColor() { + return labelColor; + } + + public Color getMarkerColor() { + return markerColor; + } + + public Color getTickColor() { + return tickColor; + } + } +} diff --git a/diylc/diylc-library/src/org/diylc/components/passive/CapacitorDimensionService.java b/diylc/diylc-library/src/org/diylc/components/passive/CapacitorDimensionService.java deleted file mode 100644 index 53845a2b..00000000 --- a/diylc/diylc-library/src/org/diylc/components/passive/CapacitorDimensionService.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * - * DIY Layout Creator (DIYLC). Copyright (c) 2009-2018 held jointly by the individual authors. - * - * This file is part of DIYLC. - * - * DIYLC is free software: you can redistribute it and/or modify it under the terms of the GNU - * General Public License as published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * DIYLC is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even - * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General - * Public License for more details. - * - * You should have received a copy of the GNU General Public License along with DIYLC. If not, see - * . - * - */ -package org.diylc.components.passive; - -import java.text.DecimalFormat; -import java.text.NumberFormat; -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; -import org.diylc.core.measures.Capacitance; -import org.diylc.core.measures.Size; -import org.diylc.core.measures.SizeUnit; -import org.diylc.core.measures.Voltage; -import org.diylc.presenter.DatasheetService; - -public class CapacitorDimensionService { - - private static final double TOLERANCE = 10d; - - private static CapacitorDimensionService instance; - - private static NumberFormat format = new DecimalFormat("##.###"); - - private Map cache = new HashMap(); - - public static CapacitorDimensionService getInstance() { - if (instance == null) { - instance = new CapacitorDimensionService(); - } - return instance; - } - - public CapacitorDimensions lookup(Class clazz, String key, Voltage voltage, Capacitance value) { - return lookup(clazz, key, voltage, value, null); - } - - public CapacitorDimensions lookup(Class clazz, String key, Voltage voltage, Capacitance value, - Boolean polarized) { - - String lookupKey = key + "|" + format.format(voltage.getNormalizedValue()) + " VDC" - + (Optional.ofNullable(polarized).map(p -> p ? "" : " NP").orElse("")); - - String cacheKey = clazz.getName() + lookupKey + "|" + format.format(value.getNormalizedValue()); - - return cache.computeIfAbsent(cacheKey, k -> { - String[] lookup = DatasheetService.getInstance().lookup(clazz, TOLERANCE, lookupKey, - value.getNormalizedValue()); - - if (lookup != null) { - Size length = new Size(Double.parseDouble(lookup[3]), SizeUnit.mm); - Size diameter = new Size(Double.parseDouble(lookup[4]), SizeUnit.mm); - return new CapacitorDimensions(length, diameter); - } - return null; - }); - } - - public static class CapacitorDimensions { - private Size length; - private Size diameter; - private Size height; - - public CapacitorDimensions(Size length, Size diameter, Size height) { - super(); - this.length = length; - this.diameter = diameter; - this.height = height; - } - - public CapacitorDimensions(Size length, Size diameter) { - super(); - this.length = length; - this.diameter = diameter; - } - - public Size getLength() { - return length; - } - - public Size getDiameter() { - return diameter; - } - - public Size getHeight() { - return height; - } - } -} diff --git a/diylc/diylc-library/src/org/diylc/components/passive/RadialFilmCapacitor.datasheet b/diylc/diylc-library/src/org/diylc/components/passive/RadialFilmCapacitor.datasheet index 84a03081..fe0291ae 100644 --- a/diylc/diylc-library/src/org/diylc/components/passive/RadialFilmCapacitor.datasheet +++ b/diylc/diylc-library/src/org/diylc/components/passive/RadialFilmCapacitor.datasheet @@ -1,300 +1,300 @@ -Orange Drop 715P,100 VDC,0.0056 uF,14.5,6.4 -Orange Drop 715P,100 VDC,0.006 uF,14.5,6.4 -Orange Drop 715P,100 VDC,0.0068 uF,14.5,6.6 -Orange Drop 715P,100 VDC,0.0075 uF,14.5,6.6 -Orange Drop 715P,100 VDC,0.0082 uF,14.5,6.9 -Orange Drop 715P,100 VDC,0.009 uF,14.5,6.6 -Orange Drop 715P,100 VDC,0.01 uF,14.5,6.6 -Orange Drop 715P,100 VDC,0.012 uF,14.5,7.1 -Orange Drop 715P,100 VDC,0.015 uF,14.5,7.4 -Orange Drop 715P,100 VDC,0.018 uF,14.5,7.9 -Orange Drop 715P,100 VDC,0.022 uF,14.5,8.4 -Orange Drop 715P,100 VDC,0.025 uF,14.5,8.9 -Orange Drop 715P,100 VDC,0.027 uF,14.5,8.9 -Orange Drop 715P,100 VDC,0.033 uF,14.5,9.7 -Orange Drop 715P,100 VDC,0.039 uF,17.8,8.6 -Orange Drop 715P,100 VDC,0.047 uF,17.8,9.1 -Orange Drop 715P,100 VDC,0.05 uF,17.8,9.4 -Orange Drop 715P,100 VDC,0.056 uF,17.8,9.7 -Orange Drop 715P,100 VDC,0.062 uF,17.8,10.2 -Orange Drop 715P,100 VDC,0.068 uF,17.8,10.4 -Orange Drop 715P,100 VDC,0.075 uF,22.9,9.1 -Orange Drop 715P,100 VDC,0.082 uF,22.9,9.4 -Orange Drop 715P,100 VDC,0.09 uF,22.9,9.7 -Orange Drop 715P,100 VDC,0.1 uF,22.9,10.2 -Orange Drop 715P,100 VDC,0.12 uF,22.9,10.9 -Orange Drop 715P,100 VDC,0.15 uF,22.9,11.7 -Orange Drop 715P,100 VDC,0.18 uF,22.9,12.7 -Orange Drop 715P,100 VDC,0.2 uF,22.9,13.2 -Orange Drop 715P,100 VDC,0.22 uF,22.9,13.7 -Orange Drop 715P,100 VDC,0.25 uF,31.8,11.9 -Orange Drop 715P,100 VDC,0.27 uF,31.8,12.2 -Orange Drop 715P,100 VDC,0.3 uF,31.8,12.7 -Orange Drop 715P,100 VDC,0.33 uF,31.8,13.2 -Orange Drop 715P,200 VDC,0.01 uF,17.8,6.4 -Orange Drop 715P,200 VDC,0.012 uF,17.8,6.6 -Orange Drop 715P,200 VDC,0.015 uF,17.8,7.1 -Orange Drop 715P,200 VDC,0.018 uF,17.8,7.4 -Orange Drop 715P,200 VDC,0.022 uF,17.8,7.9 -Orange Drop 715P,200 VDC,0.027 uF,17.8,8.4 -Orange Drop 715P,200 VDC,0.033 uF,17.8,9.1 -Orange Drop 715P,200 VDC,0.039 uF,22.9,8.1 -Orange Drop 715P,200 VDC,0.047 uF,22.9,8.6 -Orange Drop 715P,200 VDC,0.056 uF,22.9,9.4 -Orange Drop 715P,200 VDC,0.068 uF,22.9,9.9 -Orange Drop 715P,200 VDC,0.082 uF,31.8,9.1 -Orange Drop 715P,200 VDC,0.1 uF,31.8,9.7 -Orange Drop 715P,200 VDC,0.12 uF,31.8,10.4 -Orange Drop 715P,200 VDC,0.15 uF,31.8,11.2 -Orange Drop 715P,200 VDC,0.18 uF,31.8,11.9 -Orange Drop 715P,200 VDC,0.22 uF,31.8,13 -Orange Drop 715P,200 VDC,0.27 uF,41.9,12.4 -Orange Drop 715P,200 VDC,0.33 uF,41.9,13.5 -Orange Drop 715P,200 VDC,0.39 uF,41.9,14.2 -Orange Drop 715P,200 VDC,0.47 uF,41.9,15.2 -Orange Drop 715P,400 VDC,0.001 uF,17.8,8.9 -Orange Drop 715P,400 VDC,0.0012 uF,17.8,9.1 -Orange Drop 715P,400 VDC,0.0015 uF,17.8,8.1 -Orange Drop 715P,400 VDC,0.0018 uF,17.8,8.6 -Orange Drop 715P,400 VDC,0.0022 uF,17.8,8.4 -Orange Drop 715P,400 VDC,0.0027 uF,17.8,8.9 -Orange Drop 715P,400 VDC,0.0033 uF,17.8,8.1 -Orange Drop 715P,400 VDC,0.0039 uF,17.8,8.6 -Orange Drop 715P,400 VDC,0.0047 uF,17.8,8.6 -Orange Drop 715P,400 VDC,0.0056 uF,17.8,9.1 -Orange Drop 715P,400 VDC,0.0068 uF,17.8,7.4 -Orange Drop 715P,400 VDC,0.0082 uF,17.8,7.6 -Orange Drop 715P,400 VDC,0.01 uF,17.8,7.6 -Orange Drop 715P,400 VDC,0.012 uF,17.8,8.1 -Orange Drop 715P,400 VDC,0.015 uF,17.8,8.6 -Orange Drop 715P,400 VDC,0.018 uF,22.9,7.9 -Orange Drop 715P,400 VDC,0.022 uF,22.9,8.4 -Orange Drop 715P,400 VDC,0.027 uF,22.9,9.1 -Orange Drop 715P,400 VDC,0.033 uF,22.9,9.7 -Orange Drop 715P,400 VDC,0.039 uF,31.8,8.9 -Orange Drop 715P,400 VDC,0.047 uF,31.8,9.4 -Orange Drop 715P,400 VDC,0.056 uF,31.8,9.9 -Orange Drop 715P,400 VDC,0.068 uF,31.8,10.7 -Orange Drop 715P,400 VDC,0.082 uF,31.8,11.4 -Orange Drop 715P,400 VDC,0.1 uF,31.8,12.2 -Orange Drop 715P,400 VDC,0.12 uF,31.8,13.2 -Orange Drop 715P,400 VDC,0.15 uF,31.8,14.2 -Orange Drop 715P,400 VDC,0.18 uF,41.9,13.7 -Orange Drop 715P,400 VDC,0.22 uF,41.9,14.7 -Orange Drop 715P,400 VDC,0.27 uF,41.9,16 -Orange Drop 715P,400 VDC,0.33 uF,41.9,17.8 -Orange Drop 715P,400 VDC,0.39 uF,41.9,19.1 -Orange Drop 715P,400 VDC,0.47 uF,41.9,20.8 -Orange Drop 715P,600 VDC,0.001 uF,17.8,8.9 -Orange Drop 715P,600 VDC,0.0012 uF,17.8,9.1 -Orange Drop 715P,600 VDC,0.0015 uF,17.8,8.1 -Orange Drop 715P,600 VDC,0.0018 uF,17.8,8.6 -Orange Drop 715P,600 VDC,0.0022 uF,17.8,8.4 -Orange Drop 715P,600 VDC,0.0027 uF,17.8,8.9 -Orange Drop 715P,600 VDC,0.0033 uF,17.8,8.1 -Orange Drop 715P,600 VDC,0.0039 uF,17.8,8.6 -Orange Drop 715P,600 VDC,0.0047 uF,17.8,8.6 -Orange Drop 715P,600 VDC,0.0056 uF,17.8,9.1 -Orange Drop 715P,600 VDC,0.0068 uF,17.8,9.7 -Orange Drop 715P,600 VDC,0.0082 uF,22.9,8.6 -Orange Drop 715P,600 VDC,0.01 uF,22.9,9.1 -Orange Drop 715P,600 VDC,0.012 uF,22.9,9.7 -Orange Drop 715P,600 VDC,0.015 uF,22.9,10.7 -Orange Drop 715P,600 VDC,0.018 uF,22.9,11.2 -Orange Drop 715P,600 VDC,0.022 uF,22.9,12.2 -Orange Drop 715P,600 VDC,0.027 uF,31.8,10.2 -Orange Drop 715P,600 VDC,0.033 uF,31.8,11.7 -Orange Drop 715P,600 VDC,0.039 uF,31.8,12.4 -Orange Drop 715P,600 VDC,0.047 uF,31.8,13.2 -Orange Drop 715P,600 VDC,0.056 uF,31.8,14.2 -Orange Drop 715P,600 VDC,0.068 uF,31.8,15.2 -Orange Drop 715P,600 VDC,0.082 uF,31.8,16.5 -Orange Drop 715P,600 VDC,0.1 uF,31.8,18 -Orange Drop 715P,600 VDC,0.12 uF,41.9,16.5 -Orange Drop 715P,600 VDC,0.15 uF,41.9,18 -Orange Drop 715P,600 VDC,0.18 uF,41.9,19.6 -Orange Drop 715P,600 VDC,0.22 uF,41.9,21.1 -Orange Drop 715P,800 VDC,0.0056 uF,31.8,7.1 -Orange Drop 715P,800 VDC,0.0068 uF,31.8,7.4 -Orange Drop 715P,800 VDC,0.0082 uF,31.8,7.9 -Orange Drop 715P,800 VDC,0.01 uF,31.8,8.4 -Orange Drop 715P,800 VDC,0.012 uF,31.8,8.9 -Orange Drop 715P,800 VDC,0.015 uF,31.8,9.7 -Orange Drop 715P,800 VDC,0.018 uF,31.8,10.4 -Orange Drop 715P,800 VDC,0.022 uF,31.8,11.2 -Orange Drop 715P,800 VDC,0.027 uF,31.8,11.9 -Orange Drop 715P,800 VDC,0.033 uF,31.8,13 -Orange Drop 715P,800 VDC,0.039 uF,41.9,11.9 -Orange Drop 715P,800 VDC,0.047 uF,41.9,12.7 -Orange Drop 715P,800 VDC,0.056 uF,41.9,13.5 -Orange Drop 715P,800 VDC,0.068 uF,41.9,14.7 -Orange Drop 715P,800 VDC,0.082 uF,41.9,15.7 -Orange Drop 715P,800 VDC,0.1 uF,41.9,17 -Orange Drop 715P,1000 VDC,0.0056 uF,31.8,7.1 -Orange Drop 715P,1000 VDC,0.0068 uF,31.8,7.4 -Orange Drop 715P,1000 VDC,0.0082 uF,31.8,7.9 -Orange Drop 715P,1000 VDC,0.01 uF,31.8,8.4 -Orange Drop 715P,1000 VDC,0.012 uF,31.8,8.9 -Orange Drop 715P,1000 VDC,0.015 uF,31.8,9.7 -Orange Drop 715P,1000 VDC,0.018 uF,31.8,10.4 -Orange Drop 715P,1000 VDC,0.022 uF,31.8,11.2 -Orange Drop 715P,1000 VDC,0.027 uF,31.8,11.9 -Orange Drop 715P,1000 VDC,0.033 uF,31.8,13 -Orange Drop 715P,1000 VDC,0.039 uF,41.9,11.9 -Orange Drop 715P,1000 VDC,0.047 uF,41.9,12.7 -Orange Drop 715P,1000 VDC,0.056 uF,41.9,13.5 -Orange Drop 715P,1000 VDC,0.068 uF,41.9,14.7 -Orange Drop 715P,1000 VDC,0.082 uF,41.9,15.7 -Orange Drop 715P,1000 VDC,0.1 uF,41.9,17 -Orange Drop 716P,100 VDC,0.0082 uF,14.5,5.8 -Orange Drop 716P,100 VDC,0.009 uF,14.5,6.1 -Orange Drop 716P,100 VDC,0.01 uF,14.5,6.1 -Orange Drop 716P,100 VDC,0.012 uF,14.5,5.8 -Orange Drop 716P,100 VDC,0.015 uF,14.5,6.4 -Orange Drop 716P,100 VDC,0.018 uF,14.5,6.6 -Orange Drop 716P,100 VDC,0.022 uF,14.5,7.1 -Orange Drop 716P,100 VDC,0.025 uF,14.5,7.4 -Orange Drop 716P,100 VDC,0.027 uF,14.5,6.9 -Orange Drop 716P,100 VDC,0.033 uF,14.5,7.4 -Orange Drop 716P,100 VDC,0.039 uF,14.5,7.9 -Orange Drop 716P,100 VDC,0.047 uF,14.5,8.6 -Orange Drop 716P,100 VDC,0.05 uF,17.8,7.1 -Orange Drop 716P,100 VDC,0.056 uF,17.8,7.4 -Orange Drop 716P,100 VDC,0.062 uF,17.8,7.9 -Orange Drop 716P,100 VDC,0.068 uF,17.8,8.1 -Orange Drop 716P,100 VDC,0.075 uF,17.8,8.4 -Orange Drop 716P,100 VDC,0.082 uF,17.8,8.9 -Orange Drop 716P,100 VDC,0.09 uF,17.8,9.1 -Orange Drop 716P,100 VDC,0.1 uF,17.8,9.7 -Orange Drop 716P,100 VDC,0.12 uF,22.9,8.4 -Orange Drop 716P,100 VDC,0.15 uF,22.9,9.4 -Orange Drop 716P,100 VDC,0.18 uF,22.9,10.2 -Orange Drop 716P,100 VDC,0.2 uF,22.9,10.7 -Orange Drop 716P,100 VDC,0.22 uF,22.9,11.2 -Orange Drop 716P,100 VDC,0.25 uF,22.9,11.9 -Orange Drop 716P,100 VDC,0.27 uF,22.9,12.4 -Orange Drop 716P,100 VDC,0.3 uF,31.8,10.4 -Orange Drop 716P,100 VDC,0.33 uF,31.8,10.7 -Orange Drop 716P,200 VDC,0.01 uF,17.8,6.4 -Orange Drop 716P,200 VDC,0.012 uF,17.8,6.9 -Orange Drop 716P,200 VDC,0.015 uF,17.8,6.6 -Orange Drop 716P,200 VDC,0.018 uF,17.8,6.4 -Orange Drop 716P,200 VDC,0.022 uF,17.8,6.9 -Orange Drop 716P,200 VDC,0.027 uF,17.8,7.4 -Orange Drop 716P,200 VDC,0.033 uF,17.8,8.1 -Orange Drop 716P,200 VDC,0.039 uF,17.8,8.1 -Orange Drop 716P,200 VDC,0.047 uF,17.8,8.6 -Orange Drop 716P,200 VDC,0.056 uF,22.9,7.6 -Orange Drop 716P,200 VDC,0.068 uF,22.9,8.4 -Orange Drop 716P,200 VDC,0.082 uF,22.9,9.1 -Orange Drop 716P,200 VDC,0.1 uF,22.9,9.9 -Orange Drop 716P,200 VDC,0.12 uF,22.9,10.2 -Orange Drop 716P,200 VDC,0.15 uF,22.9,11.4 -Orange Drop 716P,200 VDC,0.18 uF,31.8,9.9 -Orange Drop 716P,200 VDC,0.22 uF,31.8,10.9 -Orange Drop 716P,200 VDC,0.27 uF,31.8,11.9 -Orange Drop 716P,200 VDC,0.33 uF,31.8,11.9 -Orange Drop 716P,200 VDC,0.39 uF,31.8,13 -Orange Drop 716P,200 VDC,0.47 uF,31.8,14.2 -Orange Drop 716P,200 VDC,0.56 uF,31.8,15.5 -Orange Drop 716P,200 VDC,0.68 uF,41.9,14.2 -Orange Drop 716P,200 VDC,0.82 uF,41.9,15.5 -Orange Drop 716P,200 VDC,1 uF,41.9,17.3 -Orange Drop 716P,400 VDC,0.001 uF,17.8,6.4 -Orange Drop 716P,400 VDC,0.0012 uF,17.8,5.6 -Orange Drop 716P,400 VDC,0.0015 uF,17.8,6.1 -Orange Drop 716P,400 VDC,0.0018 uF,17.8,6.4 -Orange Drop 716P,400 VDC,0.0022 uF,17.8,6.6 -Orange Drop 716P,400 VDC,0.0027 uF,17.8,6.1 -Orange Drop 716P,400 VDC,0.0033 uF,17.8,6.1 -Orange Drop 716P,400 VDC,0.0039 uF,17.8,6.1 -Orange Drop 716P,400 VDC,0.0047 uF,17.8,6.4 -Orange Drop 716P,400 VDC,0.0056 uF,17.8,6.1 -Orange Drop 716P,400 VDC,0.0068 uF,17.8,6.1 -Orange Drop 716P,400 VDC,0.0082 uF,17.8,6.4 -Orange Drop 716P,400 VDC,0.01 uF,17.8,6.9 -Orange Drop 716P,400 VDC,0.012 uF,17.8,7.4 -Orange Drop 716P,400 VDC,0.015 uF,17.8,7.9 -Orange Drop 716P,400 VDC,0.018 uF,22.9,7.1 -Orange Drop 716P,400 VDC,0.022 uF,22.9,7.6 -Orange Drop 716P,400 VDC,0.027 uF,22.9,7.9 -Orange Drop 716P,400 VDC,0.033 uF,22.9,8.4 -Orange Drop 716P,400 VDC,0.039 uF,22.9,9.1 -Orange Drop 716P,400 VDC,0.047 uF,22.9,9.9 -Orange Drop 716P,400 VDC,0.056 uF,22.9,10.2 -Orange Drop 716P,400 VDC,0.068 uF,22.9,10.9 -Orange Drop 716P,400 VDC,0.082 uF,31.8,9.7 -Orange Drop 716P,400 VDC,0.1 uF,31.8,10.7 -Orange Drop 716P,400 VDC,0.12 uF,31.8,11.4 -Orange Drop 716P,400 VDC,0.15 uF,31.8,11.7 -Orange Drop 716P,400 VDC,0.18 uF,31.8,12.7 -Orange Drop 716P,400 VDC,0.22 uF,31.8,14.5 -Orange Drop 716P,400 VDC,0.27 uF,31.8,16 -Orange Drop 716P,400 VDC,0.33 uF,41.9,14.5 -Orange Drop 716P,400 VDC,0.39 uF,41.9,15.7 -Orange Drop 716P,400 VDC,0.47 uF,41.9,17.3 -Orange Drop 716P,600 VDC,0.001 uF,17.8,6.9 -Orange Drop 716P,600 VDC,0.0012 uF,17.8,6.1 -Orange Drop 716P,600 VDC,0.0015 uF,17.8,6.6 -Orange Drop 716P,600 VDC,0.0018 uF,17.8,6.9 -Orange Drop 716P,600 VDC,0.0022 uF,17.8,7.1 -Orange Drop 716P,600 VDC,0.0027 uF,17.8,6.4 -Orange Drop 716P,600 VDC,0.0033 uF,17.8,6.4 -Orange Drop 716P,600 VDC,0.0039 uF,17.8,6.6 -Orange Drop 716P,600 VDC,0.0047 uF,17.8,7.1 -Orange Drop 716P,600 VDC,0.0056 uF,17.8,7.6 -Orange Drop 716P,600 VDC,0.0068 uF,17.8,8.1 -Orange Drop 716P,600 VDC,0.0082 uF,17.8,8.1 -Orange Drop 716P,600 VDC,0.01 uF,17.8,8.6 -Orange Drop 716P,600 VDC,0.012 uF,22.9,7.9 -Orange Drop 716P,600 VDC,0.015 uF,22.9,8.6 -Orange Drop 716P,600 VDC,0.018 uF,22.9,9.1 -Orange Drop 716P,600 VDC,0.022 uF,22.9,9.9 -Orange Drop 716P,600 VDC,0.027 uF,22.9,10.4 -Orange Drop 716P,600 VDC,0.033 uF,22.9,11.2 -Orange Drop 716P,600 VDC,0.039 uF,22.9,12.2 -Orange Drop 716P,600 VDC,0.047 uF,31.8,10.7 -Orange Drop 716P,600 VDC,0.056 uF,31.8,11.4 -Orange Drop 716P,600 VDC,0.068 uF,31.8,11.4 -Orange Drop 716P,600 VDC,0.082 uF,31.8,12.4 -Orange Drop 716P,600 VDC,0.1 uF,31.8,13.7 -Orange Drop 716P,600 VDC,0.12 uF,31.8,15 -Orange Drop 716P,600 VDC,0.15 uF,41.9,14 -Orange Drop 716P,600 VDC,0.18 uF,41.9,15 -Orange Drop 716P,600 VDC,0.22 uF,41.9,16.5 -Orange Drop 716P,800 VDC,0.0056 uF,31.8,6.4 -Orange Drop 716P,800 VDC,0.0068 uF,31.8,6.9 -Orange Drop 716P,800 VDC,0.0082 uF,31.8,7.4 -Orange Drop 716P,800 VDC,0.01 uF,31.8,7.4 -Orange Drop 716P,800 VDC,0.012 uF,31.8,7.9 -Orange Drop 716P,800 VDC,0.015 uF,31.8,8.6 -Orange Drop 716P,800 VDC,0.018 uF,31.8,9.4 -Orange Drop 716P,800 VDC,0.022 uF,31.8,9.7 -Orange Drop 716P,800 VDC,0.027 uF,31.8,10.7 -Orange Drop 716P,800 VDC,0.033 uF,31.8,11.7 -Orange Drop 716P,800 VDC,0.039 uF,31.8,11.7 -Orange Drop 716P,800 VDC,0.047 uF,31.8,12.7 -Orange Drop 716P,800 VDC,0.056 uF,31.8,13.7 -Orange Drop 716P,800 VDC,0.068 uF,31.8,15 -Orange Drop 716P,800 VDC,0.082 uF,41.9,13.2 -Orange Drop 716P,800 VDC,0.1 uF,41.9,14.5 -Orange Drop 716P,800 VDC,0.12 uF,41.9,15.7 -Orange Drop 716P,800 VDC,0.14 uF,41.9,17 -Orange Drop 716P,1000 VDC,0.0056 uF,31.8,6.4 -Orange Drop 716P,1000 VDC,0.0068 uF,31.8,6.9 -Orange Drop 716P,1000 VDC,0.0082 uF,31.8,7.4 -Orange Drop 716P,1000 VDC,0.01 uF,31.8,7.4 -Orange Drop 716P,1000 VDC,0.012 uF,31.8,7.9 -Orange Drop 716P,1000 VDC,0.015 uF,31.8,8.6 -Orange Drop 716P,1000 VDC,0.018 uF,31.8,9.4 -Orange Drop 716P,1000 VDC,0.022 uF,31.8,9.7 -Orange Drop 716P,1000 VDC,0.027 uF,31.8,10.7 -Orange Drop 716P,1000 VDC,0.033 uF,31.8,11.7 -Orange Drop 716P,1000 VDC,0.039 uF,31.8,11.7 -Orange Drop 716P,1000 VDC,0.047 uF,31.8,12.7 -Orange Drop 716P,1000 VDC,0.056 uF,31.8,13.7 -Orange Drop 716P,1000 VDC,0.068 uF,31.8,15 -Orange Drop 716P,1000 VDC,0.082 uF,41.9,13.2 -Orange Drop 716P,1000 VDC,0.1 uF,41.9,14.5 -Orange Drop 716P,1000 VDC,0.12 uF,41.9,15.7 -Orange Drop 716P,1000 VDC,0.14 uF,41.9,17 \ No newline at end of file +Orange Drop 715P,100 VDC,0.0056 uF,14.5,6.4,10 +Orange Drop 715P,100 VDC,0.006 uF,14.5,6.4,10 +Orange Drop 715P,100 VDC,0.0068 uF,14.5,6.6,10 +Orange Drop 715P,100 VDC,0.0075 uF,14.5,6.6,10 +Orange Drop 715P,100 VDC,0.0082 uF,14.5,6.9,10 +Orange Drop 715P,100 VDC,0.009 uF,14.5,6.6,10 +Orange Drop 715P,100 VDC,0.01 uF,14.5,6.6,10 +Orange Drop 715P,100 VDC,0.012 uF,14.5,7.1,10 +Orange Drop 715P,100 VDC,0.015 uF,14.5,7.4,10 +Orange Drop 715P,100 VDC,0.018 uF,14.5,7.9,10 +Orange Drop 715P,100 VDC,0.022 uF,14.5,8.4,10 +Orange Drop 715P,100 VDC,0.025 uF,14.5,8.9,10 +Orange Drop 715P,100 VDC,0.027 uF,14.5,8.9,10 +Orange Drop 715P,100 VDC,0.033 uF,14.5,9.7,10 +Orange Drop 715P,100 VDC,0.039 uF,17.8,8.6,12.7 +Orange Drop 715P,100 VDC,0.047 uF,17.8,9.1,12.7 +Orange Drop 715P,100 VDC,0.05 uF,17.8,9.4,12.7 +Orange Drop 715P,100 VDC,0.056 uF,17.8,9.7,12.7 +Orange Drop 715P,100 VDC,0.062 uF,17.8,10.2,12.7 +Orange Drop 715P,100 VDC,0.068 uF,17.8,10.4,12.7 +Orange Drop 715P,100 VDC,0.075 uF,22.9,9.1,17.5 +Orange Drop 715P,100 VDC,0.082 uF,22.9,9.4,17.5 +Orange Drop 715P,100 VDC,0.09 uF,22.9,9.7,17.5 +Orange Drop 715P,100 VDC,0.1 uF,22.9,10.2,17.5 +Orange Drop 715P,100 VDC,0.12 uF,22.9,10.9,17.5 +Orange Drop 715P,100 VDC,0.15 uF,22.9,11.7,17.5 +Orange Drop 715P,100 VDC,0.18 uF,22.9,12.7,17.5 +Orange Drop 715P,100 VDC,0.2 uF,22.9,13.2,17.5 +Orange Drop 715P,100 VDC,0.22 uF,22.9,13.7,17.5 +Orange Drop 715P,100 VDC,0.25 uF,31.8,11.9,26.2 +Orange Drop 715P,100 VDC,0.27 uF,31.8,12.2,26.2 +Orange Drop 715P,100 VDC,0.3 uF,31.8,12.7,26.2 +Orange Drop 715P,100 VDC,0.33 uF,31.8,13.2,26.2 +Orange Drop 715P,200 VDC,0.01 uF,17.8,6.4,12.7 +Orange Drop 715P,200 VDC,0.012 uF,17.8,6.6,12.7 +Orange Drop 715P,200 VDC,0.015 uF,17.8,7.1,12.7 +Orange Drop 715P,200 VDC,0.018 uF,17.8,7.4,12.7 +Orange Drop 715P,200 VDC,0.022 uF,17.8,7.9,12.7 +Orange Drop 715P,200 VDC,0.027 uF,17.8,8.4,12.7 +Orange Drop 715P,200 VDC,0.033 uF,17.8,9.1,12.7 +Orange Drop 715P,200 VDC,0.039 uF,22.9,8.1,17.5 +Orange Drop 715P,200 VDC,0.047 uF,22.9,8.6,17.5 +Orange Drop 715P,200 VDC,0.056 uF,22.9,9.4,17.5 +Orange Drop 715P,200 VDC,0.068 uF,22.9,9.9,17.5 +Orange Drop 715P,200 VDC,0.082 uF,31.8,9.1,26.2 +Orange Drop 715P,200 VDC,0.1 uF,31.8,9.7,26.2 +Orange Drop 715P,200 VDC,0.12 uF,31.8,10.4,26.2 +Orange Drop 715P,200 VDC,0.15 uF,31.8,11.2,26.2 +Orange Drop 715P,200 VDC,0.18 uF,31.8,11.9,26.2 +Orange Drop 715P,200 VDC,0.22 uF,31.8,13,26.2 +Orange Drop 715P,200 VDC,0.27 uF,41.9,12.4,35.7 +Orange Drop 715P,200 VDC,0.33 uF,41.9,13.5,35.7 +Orange Drop 715P,200 VDC,0.39 uF,41.9,14.2,35.7 +Orange Drop 715P,200 VDC,0.47 uF,41.9,15.2,35.7 +Orange Drop 715P,400 VDC,0.001 uF,17.8,8.9,12.7 +Orange Drop 715P,400 VDC,0.0012 uF,17.8,9.1,12.7 +Orange Drop 715P,400 VDC,0.0015 uF,17.8,8.1,12.7 +Orange Drop 715P,400 VDC,0.0018 uF,17.8,8.6,12.7 +Orange Drop 715P,400 VDC,0.0022 uF,17.8,8.4,12.7 +Orange Drop 715P,400 VDC,0.0027 uF,17.8,8.9,12.7 +Orange Drop 715P,400 VDC,0.0033 uF,17.8,8.1,12.7 +Orange Drop 715P,400 VDC,0.0039 uF,17.8,8.6,12.7 +Orange Drop 715P,400 VDC,0.0047 uF,17.8,8.6,12.7 +Orange Drop 715P,400 VDC,0.0056 uF,17.8,9.1,12.7 +Orange Drop 715P,400 VDC,0.0068 uF,17.8,7.4,12.7 +Orange Drop 715P,400 VDC,0.0082 uF,17.8,7.6,12.7 +Orange Drop 715P,400 VDC,0.01 uF,17.8,7.6,12.7 +Orange Drop 715P,400 VDC,0.012 uF,17.8,8.1,12.7 +Orange Drop 715P,400 VDC,0.015 uF,17.8,8.6,12.7 +Orange Drop 715P,400 VDC,0.018 uF,22.9,7.9,17.5 +Orange Drop 715P,400 VDC,0.022 uF,22.9,8.4,17.5 +Orange Drop 715P,400 VDC,0.027 uF,22.9,9.1,17.5 +Orange Drop 715P,400 VDC,0.033 uF,22.9,9.7,17.5 +Orange Drop 715P,400 VDC,0.039 uF,31.8,8.9,26.2 +Orange Drop 715P,400 VDC,0.047 uF,31.8,9.4,26.2 +Orange Drop 715P,400 VDC,0.056 uF,31.8,9.9,26.2 +Orange Drop 715P,400 VDC,0.068 uF,31.8,10.7,26.2 +Orange Drop 715P,400 VDC,0.082 uF,31.8,11.4,26.2 +Orange Drop 715P,400 VDC,0.1 uF,31.8,12.2,26.2 +Orange Drop 715P,400 VDC,0.12 uF,31.8,13.2,26.2 +Orange Drop 715P,400 VDC,0.15 uF,31.8,14.2,26.2 +Orange Drop 715P,400 VDC,0.18 uF,41.9,13.7,35.7 +Orange Drop 715P,400 VDC,0.22 uF,41.9,14.7,35.7 +Orange Drop 715P,400 VDC,0.27 uF,41.9,16,35.7 +Orange Drop 715P,400 VDC,0.33 uF,41.9,17.8,35.7 +Orange Drop 715P,400 VDC,0.39 uF,41.9,19.1,35.7 +Orange Drop 715P,400 VDC,0.47 uF,41.9,20.8,35.7 +Orange Drop 715P,600 VDC,0.001 uF,17.8,8.9,12.7 +Orange Drop 715P,600 VDC,0.0012 uF,17.8,9.1,12.7 +Orange Drop 715P,600 VDC,0.0015 uF,17.8,8.1,12.7 +Orange Drop 715P,600 VDC,0.0018 uF,17.8,8.6,12.7 +Orange Drop 715P,600 VDC,0.0022 uF,17.8,8.4,12.7 +Orange Drop 715P,600 VDC,0.0027 uF,17.8,8.9,12.7 +Orange Drop 715P,600 VDC,0.0033 uF,17.8,8.1,12.7 +Orange Drop 715P,600 VDC,0.0039 uF,17.8,8.6,12.7 +Orange Drop 715P,600 VDC,0.0047 uF,17.8,8.6,12.7 +Orange Drop 715P,600 VDC,0.0056 uF,17.8,9.1,12.7 +Orange Drop 715P,600 VDC,0.0068 uF,17.8,9.7,12.7 +Orange Drop 715P,600 VDC,0.0082 uF,22.9,8.6,17.5 +Orange Drop 715P,600 VDC,0.01 uF,22.9,9.1,17.5 +Orange Drop 715P,600 VDC,0.012 uF,22.9,9.7,17.5 +Orange Drop 715P,600 VDC,0.015 uF,22.9,10.7,17.5 +Orange Drop 715P,600 VDC,0.018 uF,22.9,11.2,17.5 +Orange Drop 715P,600 VDC,0.022 uF,22.9,12.2,17.5 +Orange Drop 715P,600 VDC,0.027 uF,31.8,10.2,26.2 +Orange Drop 715P,600 VDC,0.033 uF,31.8,11.7,26.2 +Orange Drop 715P,600 VDC,0.039 uF,31.8,12.4,26.2 +Orange Drop 715P,600 VDC,0.047 uF,31.8,13.2,26.2 +Orange Drop 715P,600 VDC,0.056 uF,31.8,14.2,26.2 +Orange Drop 715P,600 VDC,0.068 uF,31.8,15.2,26.2 +Orange Drop 715P,600 VDC,0.082 uF,31.8,16.5,26.2 +Orange Drop 715P,600 VDC,0.1 uF,31.8,18,26.2 +Orange Drop 715P,600 VDC,0.12 uF,41.9,16.5,35.7 +Orange Drop 715P,600 VDC,0.15 uF,41.9,18,35.7 +Orange Drop 715P,600 VDC,0.18 uF,41.9,19.6,35.7 +Orange Drop 715P,600 VDC,0.22 uF,41.9,21.1,35.7 +Orange Drop 715P,800 VDC,0.0056 uF,31.8,7.1,26.2 +Orange Drop 715P,800 VDC,0.0068 uF,31.8,7.4,26.2 +Orange Drop 715P,800 VDC,0.0082 uF,31.8,7.9,26.2 +Orange Drop 715P,800 VDC,0.01 uF,31.8,8.4,26.2 +Orange Drop 715P,800 VDC,0.012 uF,31.8,8.9,26.2 +Orange Drop 715P,800 VDC,0.015 uF,31.8,9.7,26.2 +Orange Drop 715P,800 VDC,0.018 uF,31.8,10.4,26.2 +Orange Drop 715P,800 VDC,0.022 uF,31.8,11.2,26.2 +Orange Drop 715P,800 VDC,0.027 uF,31.8,11.9,26.2 +Orange Drop 715P,800 VDC,0.033 uF,31.8,13,26.2 +Orange Drop 715P,800 VDC,0.039 uF,41.9,11.9,35.7 +Orange Drop 715P,800 VDC,0.047 uF,41.9,12.7,35.7 +Orange Drop 715P,800 VDC,0.056 uF,41.9,13.5,35.7 +Orange Drop 715P,800 VDC,0.068 uF,41.9,14.7,35.7 +Orange Drop 715P,800 VDC,0.082 uF,41.9,15.7,35.7 +Orange Drop 715P,800 VDC,0.1 uF,41.9,17,35.7 +Orange Drop 715P,1000 VDC,0.0056 uF,31.8,7.1,26.2 +Orange Drop 715P,1000 VDC,0.0068 uF,31.8,7.4,26.2 +Orange Drop 715P,1000 VDC,0.0082 uF,31.8,7.9,26.2 +Orange Drop 715P,1000 VDC,0.01 uF,31.8,8.4,26.2 +Orange Drop 715P,1000 VDC,0.012 uF,31.8,8.9,26.2 +Orange Drop 715P,1000 VDC,0.015 uF,31.8,9.7,26.2 +Orange Drop 715P,1000 VDC,0.018 uF,31.8,10.4,26.2 +Orange Drop 715P,1000 VDC,0.022 uF,31.8,11.2,26.2 +Orange Drop 715P,1000 VDC,0.027 uF,31.8,11.9,26.2 +Orange Drop 715P,1000 VDC,0.033 uF,31.8,13,26.2 +Orange Drop 715P,1000 VDC,0.039 uF,41.9,11.9,35.7 +Orange Drop 715P,1000 VDC,0.047 uF,41.9,12.7,35.7 +Orange Drop 715P,1000 VDC,0.056 uF,41.9,13.5,35.7 +Orange Drop 715P,1000 VDC,0.068 uF,41.9,14.7,35.7 +Orange Drop 715P,1000 VDC,0.082 uF,41.9,15.7,35.7 +Orange Drop 715P,1000 VDC,0.1 uF,41.9,17,35.7 +Orange Drop 716P,100 VDC,0.0082 uF,14.5,5.8,10 +Orange Drop 716P,100 VDC,0.009 uF,14.5,6.1,10 +Orange Drop 716P,100 VDC,0.01 uF,14.5,6.1,10 +Orange Drop 716P,100 VDC,0.012 uF,14.5,5.8,10 +Orange Drop 716P,100 VDC,0.015 uF,14.5,6.4,10 +Orange Drop 716P,100 VDC,0.018 uF,14.5,6.6,10 +Orange Drop 716P,100 VDC,0.022 uF,14.5,7.1,10 +Orange Drop 716P,100 VDC,0.025 uF,14.5,7.4,10 +Orange Drop 716P,100 VDC,0.027 uF,14.5,6.9,10 +Orange Drop 716P,100 VDC,0.033 uF,14.5,7.4,10 +Orange Drop 716P,100 VDC,0.039 uF,14.5,7.9,10 +Orange Drop 716P,100 VDC,0.047 uF,14.5,8.6,10 +Orange Drop 716P,100 VDC,0.05 uF,17.8,7.1,12.7 +Orange Drop 716P,100 VDC,0.056 uF,17.8,7.4,12.7 +Orange Drop 716P,100 VDC,0.062 uF,17.8,7.9,12.7 +Orange Drop 716P,100 VDC,0.068 uF,17.8,8.1,12.7 +Orange Drop 716P,100 VDC,0.075 uF,17.8,8.4,12.7 +Orange Drop 716P,100 VDC,0.082 uF,17.8,8.9,12.7 +Orange Drop 716P,100 VDC,0.09 uF,17.8,9.1,12.7 +Orange Drop 716P,100 VDC,0.1 uF,17.8,9.7,12.7 +Orange Drop 716P,100 VDC,0.12 uF,22.9,8.4,17.5 +Orange Drop 716P,100 VDC,0.15 uF,22.9,9.4,17.5 +Orange Drop 716P,100 VDC,0.18 uF,22.9,10.2,17.5 +Orange Drop 716P,100 VDC,0.2 uF,22.9,10.7,17.5 +Orange Drop 716P,100 VDC,0.22 uF,22.9,11.2,17.5 +Orange Drop 716P,100 VDC,0.25 uF,22.9,11.9,17.5 +Orange Drop 716P,100 VDC,0.27 uF,22.9,12.4,17.5 +Orange Drop 716P,100 VDC,0.3 uF,31.8,10.4,26.2 +Orange Drop 716P,100 VDC,0.33 uF,31.8,10.7,26.2 +Orange Drop 716P,200 VDC,0.01 uF,17.8,6.4,12.7 +Orange Drop 716P,200 VDC,0.012 uF,17.8,6.9,12.7 +Orange Drop 716P,200 VDC,0.015 uF,17.8,6.6,12.7 +Orange Drop 716P,200 VDC,0.018 uF,17.8,6.4,12.7 +Orange Drop 716P,200 VDC,0.022 uF,17.8,6.9,12.7 +Orange Drop 716P,200 VDC,0.027 uF,17.8,7.4,12.7 +Orange Drop 716P,200 VDC,0.033 uF,17.8,8.1,12.7 +Orange Drop 716P,200 VDC,0.039 uF,17.8,8.1,12.7 +Orange Drop 716P,200 VDC,0.047 uF,17.8,8.6,12.7 +Orange Drop 716P,200 VDC,0.056 uF,22.9,7.6,17.5 +Orange Drop 716P,200 VDC,0.068 uF,22.9,8.4,17.5 +Orange Drop 716P,200 VDC,0.082 uF,22.9,9.1,17.5 +Orange Drop 716P,200 VDC,0.1 uF,22.9,9.9,17.5 +Orange Drop 716P,200 VDC,0.12 uF,22.9,10.2,17.5 +Orange Drop 716P,200 VDC,0.15 uF,22.9,11.4,17.5 +Orange Drop 716P,200 VDC,0.18 uF,31.8,9.9,26.2 +Orange Drop 716P,200 VDC,0.22 uF,31.8,10.9,26.2 +Orange Drop 716P,200 VDC,0.27 uF,31.8,11.9,26.2 +Orange Drop 716P,200 VDC,0.33 uF,31.8,11.9,26.2 +Orange Drop 716P,200 VDC,0.39 uF,31.8,13,26.2 +Orange Drop 716P,200 VDC,0.47 uF,31.8,14.2,26.2 +Orange Drop 716P,200 VDC,0.56 uF,31.8,15.5,26.2 +Orange Drop 716P,200 VDC,0.68 uF,41.9,14.2,35.7 +Orange Drop 716P,200 VDC,0.82 uF,41.9,15.5,35.7 +Orange Drop 716P,200 VDC,1 uF,41.9,17.3,35.7 +Orange Drop 716P,400 VDC,0.001 uF,17.8,6.4,12.7 +Orange Drop 716P,400 VDC,0.0012 uF,17.8,5.6,12.7 +Orange Drop 716P,400 VDC,0.0015 uF,17.8,6.1,12.7 +Orange Drop 716P,400 VDC,0.0018 uF,17.8,6.4,12.7 +Orange Drop 716P,400 VDC,0.0022 uF,17.8,6.6,12.7 +Orange Drop 716P,400 VDC,0.0027 uF,17.8,6.1,12.7 +Orange Drop 716P,400 VDC,0.0033 uF,17.8,6.1,12.7 +Orange Drop 716P,400 VDC,0.0039 uF,17.8,6.1,12.7 +Orange Drop 716P,400 VDC,0.0047 uF,17.8,6.4,12.7 +Orange Drop 716P,400 VDC,0.0056 uF,17.8,6.1,12.7 +Orange Drop 716P,400 VDC,0.0068 uF,17.8,6.1,12.7 +Orange Drop 716P,400 VDC,0.0082 uF,17.8,6.4,12.7 +Orange Drop 716P,400 VDC,0.01 uF,17.8,6.9,12.7 +Orange Drop 716P,400 VDC,0.012 uF,17.8,7.4,12.7 +Orange Drop 716P,400 VDC,0.015 uF,17.8,7.9,12.7 +Orange Drop 716P,400 VDC,0.018 uF,22.9,7.1,17.5 +Orange Drop 716P,400 VDC,0.022 uF,22.9,7.6,17.5 +Orange Drop 716P,400 VDC,0.027 uF,22.9,7.9,17.5 +Orange Drop 716P,400 VDC,0.033 uF,22.9,8.4,17.5 +Orange Drop 716P,400 VDC,0.039 uF,22.9,9.1,17.5 +Orange Drop 716P,400 VDC,0.047 uF,22.9,9.9,17.5 +Orange Drop 716P,400 VDC,0.056 uF,22.9,10.2,17.5 +Orange Drop 716P,400 VDC,0.068 uF,22.9,10.9,17.5 +Orange Drop 716P,400 VDC,0.082 uF,31.8,9.7,26.2 +Orange Drop 716P,400 VDC,0.1 uF,31.8,10.7,26.2 +Orange Drop 716P,400 VDC,0.12 uF,31.8,11.4,26.2 +Orange Drop 716P,400 VDC,0.15 uF,31.8,11.7,26.2 +Orange Drop 716P,400 VDC,0.18 uF,31.8,12.7,26.2 +Orange Drop 716P,400 VDC,0.22 uF,31.8,14.5,26.2 +Orange Drop 716P,400 VDC,0.27 uF,31.8,16,26.2 +Orange Drop 716P,400 VDC,0.33 uF,41.9,14.5,35.7 +Orange Drop 716P,400 VDC,0.39 uF,41.9,15.7,35.7 +Orange Drop 716P,400 VDC,0.47 uF,41.9,17.3,35.7 +Orange Drop 716P,600 VDC,0.001 uF,17.8,6.9,12.7 +Orange Drop 716P,600 VDC,0.0012 uF,17.8,6.1,12.7 +Orange Drop 716P,600 VDC,0.0015 uF,17.8,6.6,12.7 +Orange Drop 716P,600 VDC,0.0018 uF,17.8,6.9,12.7 +Orange Drop 716P,600 VDC,0.0022 uF,17.8,7.1,12.7 +Orange Drop 716P,600 VDC,0.0027 uF,17.8,6.4,12.7 +Orange Drop 716P,600 VDC,0.0033 uF,17.8,6.4,12.7 +Orange Drop 716P,600 VDC,0.0039 uF,17.8,6.6,12.7 +Orange Drop 716P,600 VDC,0.0047 uF,17.8,7.1,12.7 +Orange Drop 716P,600 VDC,0.0056 uF,17.8,7.6,12.7 +Orange Drop 716P,600 VDC,0.0068 uF,17.8,8.1,12.7 +Orange Drop 716P,600 VDC,0.0082 uF,17.8,8.1,12.7 +Orange Drop 716P,600 VDC,0.01 uF,17.8,8.6,12.7 +Orange Drop 716P,600 VDC,0.012 uF,22.9,7.9,17.5 +Orange Drop 716P,600 VDC,0.015 uF,22.9,8.6,17.5 +Orange Drop 716P,600 VDC,0.018 uF,22.9,9.1,17.5 +Orange Drop 716P,600 VDC,0.022 uF,22.9,9.9,17.5 +Orange Drop 716P,600 VDC,0.027 uF,22.9,10.4,17.5 +Orange Drop 716P,600 VDC,0.033 uF,22.9,11.2,17.5 +Orange Drop 716P,600 VDC,0.039 uF,22.9,12.2,17.5 +Orange Drop 716P,600 VDC,0.047 uF,31.8,10.7,26.2 +Orange Drop 716P,600 VDC,0.056 uF,31.8,11.4,26.2 +Orange Drop 716P,600 VDC,0.068 uF,31.8,11.4,26.2 +Orange Drop 716P,600 VDC,0.082 uF,31.8,12.4,26.2 +Orange Drop 716P,600 VDC,0.1 uF,31.8,13.7,26.2 +Orange Drop 716P,600 VDC,0.12 uF,31.8,15,26.2 +Orange Drop 716P,600 VDC,0.15 uF,41.9,14,35.7 +Orange Drop 716P,600 VDC,0.18 uF,41.9,15,35.7 +Orange Drop 716P,600 VDC,0.22 uF,41.9,16.5,35.7 +Orange Drop 716P,800 VDC,0.0056 uF,31.8,6.4,26.2 +Orange Drop 716P,800 VDC,0.0068 uF,31.8,6.9,26.2 +Orange Drop 716P,800 VDC,0.0082 uF,31.8,7.4,26.2 +Orange Drop 716P,800 VDC,0.01 uF,31.8,7.4,26.2 +Orange Drop 716P,800 VDC,0.012 uF,31.8,7.9,26.2 +Orange Drop 716P,800 VDC,0.015 uF,31.8,8.6,26.2 +Orange Drop 716P,800 VDC,0.018 uF,31.8,9.4,26.2 +Orange Drop 716P,800 VDC,0.022 uF,31.8,9.7,26.2 +Orange Drop 716P,800 VDC,0.027 uF,31.8,10.7,26.2 +Orange Drop 716P,800 VDC,0.033 uF,31.8,11.7,26.2 +Orange Drop 716P,800 VDC,0.039 uF,31.8,11.7,26.2 +Orange Drop 716P,800 VDC,0.047 uF,31.8,12.7,26.2 +Orange Drop 716P,800 VDC,0.056 uF,31.8,13.7,26.2 +Orange Drop 716P,800 VDC,0.068 uF,31.8,15,26.2 +Orange Drop 716P,800 VDC,0.082 uF,41.9,13.2,35.7 +Orange Drop 716P,800 VDC,0.1 uF,41.9,14.5,35.7 +Orange Drop 716P,800 VDC,0.12 uF,41.9,15.7,35.7 +Orange Drop 716P,800 VDC,0.14 uF,41.9,17,35.7 +Orange Drop 716P,1000 VDC,0.0056 uF,31.8,6.4,26.2 +Orange Drop 716P,1000 VDC,0.0068 uF,31.8,6.9,26.2 +Orange Drop 716P,1000 VDC,0.0082 uF,31.8,7.4,26.2 +Orange Drop 716P,1000 VDC,0.01 uF,31.8,7.4,26.2 +Orange Drop 716P,1000 VDC,0.012 uF,31.8,7.9,26.2 +Orange Drop 716P,1000 VDC,0.015 uF,31.8,8.6,26.2 +Orange Drop 716P,1000 VDC,0.018 uF,31.8,9.4,26.2 +Orange Drop 716P,1000 VDC,0.022 uF,31.8,9.7,26.2 +Orange Drop 716P,1000 VDC,0.027 uF,31.8,10.7,26.2 +Orange Drop 716P,1000 VDC,0.033 uF,31.8,11.7,26.2 +Orange Drop 716P,1000 VDC,0.039 uF,31.8,11.7,26.2 +Orange Drop 716P,1000 VDC,0.047 uF,31.8,12.7,26.2 +Orange Drop 716P,1000 VDC,0.056 uF,31.8,13.7,26.2 +Orange Drop 716P,1000 VDC,0.068 uF,31.8,15,26.2 +Orange Drop 716P,1000 VDC,0.082 uF,41.9,13.2,35.7 +Orange Drop 716P,1000 VDC,0.1 uF,41.9,14.5,35.7 +Orange Drop 716P,1000 VDC,0.12 uF,41.9,15.7,35.7 +Orange Drop 716P,1000 VDC,0.14 uF,41.9,17,35.7 diff --git a/diylc/diylc-library/src/org/diylc/components/passive/RadialFilmCapacitor.java b/diylc/diylc-library/src/org/diylc/components/passive/RadialFilmCapacitor.java index db52e75a..973930f1 100644 --- a/diylc/diylc-library/src/org/diylc/components/passive/RadialFilmCapacitor.java +++ b/diylc/diylc-library/src/org/diylc/components/passive/RadialFilmCapacitor.java @@ -23,7 +23,7 @@ import java.awt.Graphics2D; import java.awt.Rectangle; import java.awt.Shape; import java.awt.geom.RoundRectangle2D; -import org.diylc.components.passive.CapacitorDimensionService.CapacitorDimensions; +import org.diylc.components.passive.CapacitorDatasheetService.CapacitorDatasheet; import org.diylc.components.transform.SimpleComponentTransformer; import org.diylc.core.CreationMethod; import org.diylc.core.IDIYComponent; @@ -51,8 +51,6 @@ public class RadialFilmCapacitor extends AbstractFilmCapacitor { private Size pinSpacing = PIN_SPACING; - private AutoSize autoSize = AutoSize.OFF; - public RadialFilmCapacitor() { super(); this.bodyColor = BODY_COLOR; @@ -61,17 +59,26 @@ public class RadialFilmCapacitor extends AbstractFilmCapacitor { public RadialFilmCapacitor(String[] parameters) { this(); - String autoSizeValue = parameters[0]; + setType(parameters[0]); Double voltageValue = Double.parseDouble(parameters[1].split(" ")[0]); Double capacitanceValue = Double.parseDouble(parameters[2].split(" ")[0]); setValue(new Capacitance(capacitanceValue, CapacitanceUnit.uF)); setVoltageNew(new org.diylc.core.measures.Voltage(voltageValue, VoltageUnit.V)); + + CapacitorDatasheet d = CapacitorDatasheetService.parseCapacitorDatasheet(true, parameters); - for (AutoSize size : AutoSize.values()) { - if (size.toString().equalsIgnoreCase(autoSizeValue)) { - setAutoSize(size); - } - } + if (d.getBodyColor() != null) + setBodyColor(d.getBodyColor()); + if (d.getBorderColor() != null) + setBorderColor(d.getBorderColor()); + if (d.getLabelColor() != null) + setLabelColor(d.getLabelColor()); + if (d.getLength() != null) + setLength(d.getLength()); + if (d.getWidth() != null) + setWidth(d.getWidth()); + if (d.getLeadSpacing() != null) + setPinSpacing(d.getLeadSpacing()); } public void drawIcon(Graphics2D g2d, int width, int height) { @@ -99,7 +106,7 @@ public class RadialFilmCapacitor extends AbstractFilmCapacitor { return (int) getPinSpacing().convertToPixels(); } - @EditableProperty(name = "Pin Spacing") + @EditableProperty(name = "Lead Spacing") public Size getPinSpacing() { if (pinSpacing == null) { pinSpacing = PIN_SPACING; @@ -110,68 +117,4 @@ public class RadialFilmCapacitor extends AbstractFilmCapacitor { public void setPinSpacing(Size pinSpacing) { this.pinSpacing = pinSpacing; } - - @EditableProperty(name = "Auto Size") - public AutoSize getAutoSize() { - if (autoSize == null) { - autoSize = AutoSize.OFF; - } - return autoSize; - } - - public void setAutoSize(AutoSize autoSize) { - this.autoSize = autoSize; - } - - @EditableProperty - @Override - public Size getLength() { - AutoSize autoSize = getAutoSize(); - if (autoSize != null && autoSize != AutoSize.OFF && getVoltageNew() != null - && getVoltageNew().getNormalizedValue() != null && getValue() != null - && getValue().getNormalizedValue() != null) { - - CapacitorDimensions d = CapacitorDimensionService.getInstance().lookup(this.getClass(), - autoSize.toString(), getVoltageNew(), getValue()); - - if (d != null) { - return d.getLength(); - } - } - - return super.getLength(); - } - - @EditableProperty - @Override - public Size getWidth() { - AutoSize autoSize = getAutoSize(); - if (autoSize != null && autoSize != AutoSize.OFF && getVoltageNew() != null - && getVoltageNew().getNormalizedValue() != null && getValue() != null - && getValue().getNormalizedValue() != null) { - - CapacitorDimensions d = CapacitorDimensionService.getInstance().lookup(this.getClass(), - autoSize.toString(), getVoltageNew(), getValue()); - - if (d != null) { - return d.getDiameter(); - } - } - return super.getWidth(); - } - - private static enum AutoSize { - OFF("Off"), ORANGE_DROP_715P("Orange Drop 715P"), ORANGE_DROP_716P("Orange Drop 716P"); - - private String label; - - AutoSize(String label) { - this.label = label; - } - - @Override - public String toString() { - return label; - } - } } diff --git a/diylc/diylc-library/test/org/diylc/components/passive/CapacitorDimensionServiceTests.java b/diylc/diylc-library/test/org/diylc/components/passive/CapacitorDimensionServiceTests.java index 342bd508..3f6e54a1 100644 --- a/diylc/diylc-library/test/org/diylc/components/passive/CapacitorDimensionServiceTests.java +++ b/diylc/diylc-library/test/org/diylc/components/passive/CapacitorDimensionServiceTests.java @@ -1,6 +1,6 @@ package org.diylc.components.passive; -import org.diylc.components.passive.CapacitorDimensionService.CapacitorDimensions; +import org.diylc.components.passive.CapacitorDatasheetService.CapacitorDatasheet; import org.diylc.core.measures.Capacitance; import org.diylc.core.measures.CapacitanceUnit; import org.diylc.core.measures.Size; @@ -14,37 +14,37 @@ public class CapacitorDimensionServiceTests { @Test public void testMissingType() { - Assert.assertNull(CapacitorDimensionService.getInstance().lookup(AxialFilmCapacitor.class, + Assert.assertNull(CapacitorDatasheetService.getInstance().lookup(AxialFilmCapacitor.class, "bla", new Voltage(100d, VoltageUnit.V), new Capacitance(10d, CapacitanceUnit.uF))); } @Test public void testMissingCategory() { - Assert.assertNull(CapacitorDimensionService.getInstance().lookup(AxialFilmCapacitor.class, + Assert.assertNull(CapacitorDatasheetService.getInstance().lookup(AxialFilmCapacitor.class, "Mallory 150", new Voltage(500d, VoltageUnit.V), new Capacitance(10d, CapacitanceUnit.nF))); } @Test public void testMissingValue() { - Assert.assertNull(CapacitorDimensionService.getInstance().lookup(AxialFilmCapacitor.class, + Assert.assertNull(CapacitorDatasheetService.getInstance().lookup(AxialFilmCapacitor.class, "Mallory 150", new Voltage(600d, VoltageUnit.V), new Capacitance(10d, CapacitanceUnit.uF))); } @Test public void testExactValue63v() { - CapacitorDimensions dim = CapacitorDimensionService.getInstance().lookup(AxialFilmCapacitor.class, + CapacitorDatasheet dim = CapacitorDatasheetService.getInstance().lookup(AxialFilmCapacitor.class, "Mallory 150", new Voltage(63d, VoltageUnit.V), new Capacitance(0.22d, CapacitanceUnit.uF)); Assert.assertNotNull(dim); Assert.assertEquals(new Size(16.5, SizeUnit.mm).convertToPixels(), dim.getLength(), 0.0001); - Assert.assertEquals(new Size(6d, SizeUnit.mm).convertToPixels(), dim.getDiameter(), 0.0001); + Assert.assertEquals(new Size(6d, SizeUnit.mm).convertToPixels(), dim.getWidth(), 0.0001); } @Test public void testCloseValue() { - CapacitorDimensions dim = CapacitorDimensionService.getInstance().lookup(AxialFilmCapacitor.class, + CapacitorDatasheet dim = CapacitorDatasheetService.getInstance().lookup(AxialFilmCapacitor.class, "Mallory 150", new Voltage(63d, VoltageUnit.V), new Capacitance(0.23d, CapacitanceUnit.uF)); Assert.assertNotNull(dim); Assert.assertEquals(new Size(16.5, SizeUnit.mm).convertToPixels(), dim.getLength(), 0.0001); - Assert.assertEquals(new Size(6d, SizeUnit.mm).convertToPixels(), dim.getDiameter(), 0.0001); + Assert.assertEquals(new Size(6d, SizeUnit.mm).convertToPixels(), dim.getWidth(), 0.0001); } }