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

Added 'Envelope' property to tube symbol components which can be used to display one side of the outer envelope dashed indicating section A or section B of a tube

Browse Source
This commit is contained in:
Bane Stojkovic
2026-04-03 21:09:24 +02:00
parent 27f5c53afc
commit 2001a1af7b
3 changed files with 66 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-core/src/main/resources/update.xml
+4
View File
@@ -305,6 +305,10 @@
<changeType>NEW_FEATURE</changeType>
<description>Added new 'Dial Scale' variations - 'Ticks + Numeric (0/5.5/11)' a'la Friedman and another variation of 'Ticks' with more pronounced 9/12/3 o'clock indices</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>NEW_FEATURE</changeType>
<description>Added 'Envelope' property to tube symbol components which can be used to display one side of the outer envelope dashed indicating section A or section B of a tube</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>NEW_FEATURE</changeType>
<description>Added more ceramic resistor variants to 'Resistor' component</description>
diylc/diylc-library/src/main/java/org/diylc/components/tube/AbstractTubeSymbol.java
+44 -1
View File
@@ -63,6 +63,7 @@ public abstract class AbstractTubeSymbol extends AbstractComponent<String> {
protected Orientation orientation = Orientation.DEFAULT;
protected SymbolFlipping flip = SymbolFlipping.NONE;
protected Point2D[] controlPoints;
protected TubeEnvelope envelope = TubeEnvelope.FULL;
@Override
public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project,
@@ -92,7 +93,16 @@ public abstract class AbstractTubeSymbol extends AbstractComponent<String> {
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
g2d.draw(body[1]);
if (body[2] != null) {
if (body.length > 3) {
if (body[3] != null) {
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
g2d.draw(body[3]);
}
if (body[4] != null) {
g2d.setStroke(new java.awt.BasicStroke(1f, java.awt.BasicStroke.CAP_ROUND, java.awt.BasicStroke.JOIN_BEVEL, 0, new float[] {4f}, 6f));
g2d.draw(body[4]);
}
} else if (body.length > 2 && body[2] != null) {
g2d.draw(body[2]);
}
@@ -213,6 +223,19 @@ public abstract class AbstractTubeSymbol extends AbstractComponent<String> {
this.body = null;
}
@EditableProperty(name = "Envelope")
public TubeEnvelope getEnvelope() {
if (envelope == null) {
envelope = TubeEnvelope.FULL;
}
return envelope;
}
public void setEnvelope(TubeEnvelope envelope) {
this.envelope = envelope;
this.body = null;
}
/**
* Returns transistor shape consisting of 3 parts, in this order: electrodes, connectors, bulb.
*
@@ -224,6 +247,26 @@ public abstract class AbstractTubeSymbol extends AbstractComponent<String> {
if (this.body == null) {
Shape[] newBody = initializeBody();
if (this.envelope != TubeEnvelope.FULL && newBody.length >= 3 && newBody[2] != null) {
java.awt.geom.Rectangle2D bounds = newBody[2].getBounds2D();
Shape[] splitBody = new Shape[5];
splitBody[0] = newBody[0];
splitBody[1] = newBody[1];
splitBody[2] = newBody[2];
double bx = bounds.getX();
double by = bounds.getY();
double bsz = bounds.getWidth();
if (this.envelope == TubeEnvelope.SECTION_A) {
splitBody[3] = new java.awt.geom.Arc2D.Double(bx, by, bsz, bsz, 90, 180, java.awt.geom.Arc2D.OPEN);
splitBody[4] = new java.awt.geom.Arc2D.Double(bx, by, bsz, bsz, 270, 180, java.awt.geom.Arc2D.OPEN);
} else {
splitBody[3] = new java.awt.geom.Arc2D.Double(bx, by, bsz, bsz, 270, 180, java.awt.geom.Arc2D.OPEN);
splitBody[4] = new java.awt.geom.Arc2D.Double(bx, by, bsz, bsz, 90, 180, java.awt.geom.Arc2D.OPEN);
}
newBody = splitBody;
}
// int pinSpacing = (int) PIN_SPACING.convertToPixels();
double centerX = this.controlPoints[0].getX();// + pinSpacing * 3;
double centerY = this.controlPoints[0].getY();
diylc/diylc-library/src/main/java/org/diylc/components/tube/TubeEnvelope.java
+18
View File
@@ -0,0 +1,18 @@
package org.diylc.components.tube;
public enum TubeEnvelope {
FULL("Full"),
SECTION_A("Section A"),
SECTION_B("Section B");
private String name;
private TubeEnvelope(String name) {
this.name = name;
}
@Override
public String toString() {
return name;
}
}