improve pentode symbol. remove unused code

diylc/diylc-library/src/org/diylc/components/tube/AbstractTubeSymbol.java

@@ -198,7 +198,5 @@ public abstract class AbstractTubeSymbol extends AbstractComponent<String> {
    */
   protected abstract Shape[] getBody();
 
-  protected abstract Point getTextLocation();
-
   protected abstract void updateControlPoints();
 }

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;

diylc/diylc-library/src/org/diylc/components/tube/PentodeSymbol.java

@@ -104,8 +104,7 @@ public class PentodeSymbol extends AbstractTubeSymbol {
         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.curveTo(x + pinSpacing * 5, y + pinSpacing * 3 / 8, x + pinSpacing * 5, y + pinSpacing * 3 / 8, x + pinSpacing * 4, y + pinSpacing * 3 / 8);
-        polyline.lineTo(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;

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;

diylc/diylc-swing/update.xml

@@ -1434,6 +1434,10 @@
 					<changeType>IMPROVEMENT</changeType>
 					<description>Increased maximum zoom range from 200% to 300%</description>
 				</org.diylc.appframework.update.Change>
+				<org.diylc.appframework.update.Change>
+					<changeType>IMPROVEMENT</changeType>
+					<description>Improved pentode symbol without the suppressor grid</description>
+				</org.diylc.appframework.update.Change>
 			</changes>
 			<url>https://github.com/bancika/diy-layout-creator/releases</url>
 		</org.diylc.appframework.update.Version>