BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-10 09:12:09 +10:00
Code Issues Packages Projects Releases Wiki Activity

Added 'Tubular Beveled' shape option to Resistor component and added Dale CCF55 and CCF60 variants

Browse Source
This commit is contained in:
Bane Stojkovic
2022-11-08 00:02:57 +01:00
parent 5cc652331e
commit bdfd130fb7
3 changed files with 169 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-library/src/org/diylc/components/passive/Resistor.java
+15 -6
View File
@@ -29,6 +29,7 @@ import java.awt.geom.Area;
import java.awt.geom.Ellipse2D;
import java.awt.geom.Line2D;
import java.awt.geom.Rectangle2D;
import java.awt.geom.RoundRectangle2D;
import org.diylc.common.ObjectCache;
import org.diylc.common.ResistorColorCode;
import org.diylc.components.AbstractLeadedComponent;
@@ -157,17 +158,20 @@ public class Resistor extends AbstractLeadedComponent<Resistance> {
}
@Override
protected Shape getBodyShape() {
if (getShape() == ResistorShape.Standard) {
double length = getLength().convertToPixels();
double width = getClosestOdd(getWidth().convertToPixels());
protected Shape getBodyShape() {
double length = getLength().convertToPixels();
double width = getClosestOdd(getWidth().convertToPixels());
ResistorShape shape = getShape();
if (shape == ResistorShape.Standard) {
Rectangle2D rect = new Rectangle2D.Double(width / 2, width / 10, length - width, width * 8 / 10);
Area a = new Area(rect);
a.add(new Area(new Ellipse2D.Double(0, 0, width, width)));
a.add(new Area(new Ellipse2D.Double(length - width, 0, width, width)));
return a;
} else if (shape == ResistorShape.Tubular_Beveled) {
return new RoundRectangle2D.Double(0f, 0f, length, width, width * 2 / 3, width * 2 / 3);
}
return new Rectangle2D.Double(0f, 0f, getLength().convertToPixels(), getClosestOdd(getWidth().convertToPixels()));
return new Rectangle2D.Double(0f, 0f, length, width);
}
@Override
@@ -216,6 +220,11 @@ public class Resistor extends AbstractLeadedComponent<Resistance> {
}
public enum ResistorShape {
Tubular, Standard
Tubular, Tubular_Beveled, Standard;
@Override
public String toString() {
return super.toString().replace('_', ' ');
}
}
}