diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index 1dd5bfe0..e241ccdc 100644 Binary files a/diylc/diylc-library/lib/diylc-core.jar and b/diylc/diylc-library/lib/diylc-core.jar differ diff --git a/diylc/diylc-library/src/org/diylc/components/tube/AbstractTubeSymbol.java b/diylc/diylc-library/src/org/diylc/components/tube/AbstractTubeSymbol.java index 1c5cceb5..5b6bbdd9 100644 --- a/diylc/diylc-library/src/org/diylc/components/tube/AbstractTubeSymbol.java +++ b/diylc/diylc-library/src/org/diylc/components/tube/AbstractTubeSymbol.java @@ -198,7 +198,5 @@ public abstract class AbstractTubeSymbol extends AbstractComponent { */ protected abstract Shape[] getBody(); - protected abstract Point getTextLocation(); - protected abstract void updateControlPoints(); } diff --git a/diylc/diylc-library/src/org/diylc/components/tube/DiodeSymbol.java b/diylc/diylc-library/src/org/diylc/components/tube/DiodeSymbol.java index c032e31c..250fb337 100644 --- a/diylc/diylc-library/src/org/diylc/components/tube/DiodeSymbol.java +++ b/diylc/diylc-library/src/org/diylc/components/tube/DiodeSymbol.java @@ -151,12 +151,6 @@ public class DiodeSymbol extends AbstractTubeSymbol { } } - @Override - protected Point getTextLocation() { - int pinSpacing = (int) PIN_SPACING.convertToPixels(); - return new Point(controlPoints[0].x + pinSpacing * 5, controlPoints[0].y + pinSpacing * 2); - } - @EditableProperty(name = "Directly heated") public boolean getDirectlyHeated() { return directlyHeated; diff --git a/diylc/diylc-library/src/org/diylc/components/tube/PentodeSymbol.java b/diylc/diylc-library/src/org/diylc/components/tube/PentodeSymbol.java index d0406862..a38e3a8c 100644 --- a/diylc/diylc-library/src/org/diylc/components/tube/PentodeSymbol.java +++ b/diylc/diylc-library/src/org/diylc/components/tube/PentodeSymbol.java @@ -103,9 +103,8 @@ public class PentodeSymbol extends AbstractTubeSymbol { polyline.lineTo(x + pinSpacing * 5, y - pinSpacing * 5 / 4); polyline.curveTo(x + pinSpacing * 21 / 4, y - pinSpacing * 5 / 4, x + pinSpacing * 21 / 4, y - pinSpacing * 3 / 4, x + pinSpacing * 5, y - pinSpacing * 3 / 4); - polyline.moveTo(x + pinSpacing * 5, y - pinSpacing * 3 / 4); - polyline.lineTo(x + pinSpacing * 5, y + pinSpacing * 3 / 8); - polyline.lineTo(x + pinSpacing * 4, y + pinSpacing * 3 / 8); + polyline.moveTo(x + pinSpacing * 5, y - pinSpacing * 3 / 4); + polyline.curveTo(x + pinSpacing * 5, y + pinSpacing * 3 / 8, x + pinSpacing * 5, y + pinSpacing * 3 / 8, x + pinSpacing * 4, y + pinSpacing * 3 / 8); } // plate @@ -199,12 +198,6 @@ public class PentodeSymbol extends AbstractTubeSymbol { } } - @Override - protected Point getTextLocation() { - int pinSpacing = (int) PIN_SPACING.convertToPixels(); - return new Point(controlPoints[0].x + pinSpacing * 5, controlPoints[0].y + pinSpacing); - } - @EditableProperty(name = "Suppressor grid") public boolean getExposeSuppressorGrid() { return exposeSuppressorGrid; diff --git a/diylc/diylc-library/src/org/diylc/components/tube/TriodeSymbol.java b/diylc/diylc-library/src/org/diylc/components/tube/TriodeSymbol.java index 811d10c0..effde503 100644 --- a/diylc/diylc-library/src/org/diylc/components/tube/TriodeSymbol.java +++ b/diylc/diylc-library/src/org/diylc/components/tube/TriodeSymbol.java @@ -167,12 +167,6 @@ public class TriodeSymbol extends AbstractTubeSymbol { } } - @Override - protected Point getTextLocation() { - int pinSpacing = (int) PIN_SPACING.convertToPixels(); - return new Point(controlPoints[0].x + pinSpacing * 5, controlPoints[0].y + pinSpacing * 2); - } - @EditableProperty(name = "Directly heated") public boolean getDirectlyHeated() { return directlyHeated; diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index 1dd5bfe0..e241ccdc 100644 Binary files a/diylc/diylc-swing/lib/diylc-core.jar and b/diylc/diylc-swing/lib/diylc-core.jar differ diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar index 6c9b6154..6292afab 100644 Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ diff --git a/diylc/diylc-swing/update.xml b/diylc/diylc-swing/update.xml index e311ce7b..4e0a2289 100644 --- a/diylc/diylc-swing/update.xml +++ b/diylc/diylc-swing/update.xml @@ -1434,6 +1434,10 @@ IMPROVEMENT Increased maximum zoom range from 200% to 300% + + IMPROVEMENT + Improved pentode symbol without the suppressor grid + https://github.com/bancika/diy-layout-creator/releases