Pentode symbol

diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/tube/AbstractTubeSymbol.java

@@ -119,7 +119,7 @@ public abstract class AbstractTubeSymbol extends AbstractComponent<String> {
 		this.display = display;
 	}
 
-	@EditableProperty(name = "Show heaters")
+	@EditableProperty(name = "Heaters")
 	public boolean getShowHeaters() {
 		return showHeaters;
 	}

diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/tube/PentodeSymbol.java

@@ -0,0 +1,254 @@
+package org.diylc.components.tube;
+
+import java.awt.BasicStroke;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.Shape;
+import java.awt.geom.Ellipse2D;
+import java.awt.geom.GeneralPath;
+
+import org.diylc.common.ObjectCache;
+import org.diylc.core.IDIYComponent;
+import org.diylc.core.VisibilityPolicy;
+import org.diylc.core.annotations.ComponentDescriptor;
+import org.diylc.core.annotations.EditableProperty;
+
+@ComponentDescriptor(name = "Pentode Symbol", author = "Branislav Stojkovic", category = "Tubes", instanceNamePrefix = "V", description = "Pentode tube symbol", stretchable = false, zOrder = IDIYComponent.COMPONENT)
+public class PentodeSymbol extends AbstractTubeSymbol {
+
+	private static final long serialVersionUID = 1L;
+
+	protected Point[] controlPoints = new Point[] { new Point(0, 0),
+			new Point(0, 0), new Point(0, 0), new Point(0, 0), new Point(0, 0),
+			new Point(0, 0), new Point(0, 0) };
+
+	protected boolean exposeSuppressorGrid = true;
+
+	public PentodeSymbol() {
+		super();
+		updateControlPoints();
+	}
+
+	public Shape[] getBody() {
+		if (body == null) {
+			body = new Shape[3];
+			int x = controlPoints[0].x;
+			int y = controlPoints[0].y;
+			int pinSpacing = (int) PIN_SPACING.convertToPixels();
+
+			// electrodes
+			GeneralPath polyline = new GeneralPath();
+
+			// grid 1
+			polyline.moveTo(x + pinSpacing * 5 / 4, y - pinSpacing * 3 / 8);
+			polyline.lineTo(x + pinSpacing * 7 / 4, y - pinSpacing * 3 / 8);
+			polyline.moveTo(x + pinSpacing * 9 / 4, y - pinSpacing * 3 / 8);
+			polyline.lineTo(x + pinSpacing * 11 / 4, y - pinSpacing * 3 / 8);
+			polyline.moveTo(x + pinSpacing * 13 / 4, y - pinSpacing * 3 / 8);
+			polyline.lineTo(x + pinSpacing * 15 / 4, y - pinSpacing * 3 / 8);
+			polyline.moveTo(x + pinSpacing * 17 / 4, y - pinSpacing * 3 / 8);
+			polyline.lineTo(x + pinSpacing * 19 / 4, y - pinSpacing * 3 / 8);
+
+			// grid 2
+			polyline.moveTo(x + pinSpacing * 5 / 4, y - pinSpacing);
+			polyline.lineTo(x + pinSpacing * 7 / 4, y - pinSpacing);
+			polyline.moveTo(x + pinSpacing * 9 / 4, y - pinSpacing);
+			polyline.lineTo(x + pinSpacing * 11 / 4, y - pinSpacing);
+			polyline.moveTo(x + pinSpacing * 13 / 4, y - pinSpacing);
+			polyline.lineTo(x + pinSpacing * 15 / 4, y - pinSpacing);
+			polyline.moveTo(x + pinSpacing * 17 / 4, y - pinSpacing);
+			polyline.lineTo(x + pinSpacing * 19 / 4, y - pinSpacing);
+
+			// grid 3
+			polyline.moveTo(x + pinSpacing * 5 / 4, y - pinSpacing - pinSpacing
+					* 5 / 8);
+			polyline.lineTo(x + pinSpacing * 7 / 4, y - pinSpacing - pinSpacing
+					* 5 / 8);
+			polyline.moveTo(x + pinSpacing * 9 / 4, y - pinSpacing - pinSpacing
+					* 5 / 8);
+			polyline.lineTo(x + pinSpacing * 11 / 4, y - pinSpacing
+					- pinSpacing * 5 / 8);
+			polyline.moveTo(x + pinSpacing * 13 / 4, y - pinSpacing
+					- pinSpacing * 5 / 8);
+			polyline.lineTo(x + pinSpacing * 15 / 4, y - pinSpacing
+					- pinSpacing * 5 / 8);
+			polyline.moveTo(x + pinSpacing * 17 / 4, y - pinSpacing
+					- pinSpacing * 5 / 8);
+			polyline.lineTo(x + pinSpacing * 19 / 4, y - pinSpacing
+					- pinSpacing * 5 / 8);
+
+			// plate
+			polyline.moveTo(x + pinSpacing * 3 / 2, y - pinSpacing * 9 / 4);
+			polyline.lineTo(x + pinSpacing * 9 / 2, y - pinSpacing * 9 / 4);
+
+			// cathode
+			polyline.moveTo(x + pinSpacing * 2, y + pinSpacing * 3 / 8);
+			polyline.lineTo(x + pinSpacing * 4, y + pinSpacing * 3 / 8);
+
+			body[0] = polyline;
+
+			// connectors
+			polyline = new GeneralPath();
+
+			// grid1
+			polyline.moveTo(x, y);
+			polyline.lineTo(x + pinSpacing, y);
+			polyline.lineTo(x + pinSpacing * 5 / 4, y - pinSpacing * 3 / 8);
+
+			// grid2
+			polyline.moveTo(controlPoints[3].x, controlPoints[3].y);
+			polyline.lineTo(x + pinSpacing * 19 / 4, y - pinSpacing);
+
+			// grid3
+			if (exposeSuppressorGrid) {
+				polyline.moveTo(controlPoints[4].x, controlPoints[4].y);
+				polyline.lineTo(x + pinSpacing, controlPoints[4].y);
+				polyline.lineTo(x + pinSpacing * 5 / 4, y - pinSpacing
+						- pinSpacing * 5 / 8);
+			} else {
+				polyline.moveTo(x + pinSpacing * 19 / 4, y - pinSpacing
+						- pinSpacing * 5 / 8);
+				polyline.lineTo(x + pinSpacing * 5, y - pinSpacing - pinSpacing
+						* 5 / 8);
+				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);
+			}
+
+			// plate
+			polyline.moveTo(controlPoints[1].x, controlPoints[1].y);
+			polyline.lineTo(x + pinSpacing * 3, y - pinSpacing * 9 / 4);
+
+			// cathode
+			polyline.moveTo(controlPoints[2].x, controlPoints[2].y);
+			polyline.lineTo(x + pinSpacing * 2, y + pinSpacing * 3 / 8);
+
+			if (showHeaters) {
+				polyline.moveTo(controlPoints[5].x, controlPoints[5].y);
+				polyline.lineTo(controlPoints[5].x, controlPoints[5].y
+						- pinSpacing * 6 / 8);
+				polyline.lineTo(controlPoints[5].x + pinSpacing / 2,
+						controlPoints[5].y - pinSpacing * 10 / 8);
+
+				polyline.moveTo(controlPoints[6].x, controlPoints[6].y);
+				polyline.lineTo(controlPoints[6].x, controlPoints[6].y
+						- pinSpacing * 6 / 8);
+				polyline.lineTo(controlPoints[6].x - pinSpacing / 2,
+						controlPoints[6].y - pinSpacing * 10 / 8);
+			}
+
+			body[1] = polyline;
+
+			// bulb
+			body[2] = new Ellipse2D.Double(x + pinSpacing / 2, y - pinSpacing
+					* 7 / 2, pinSpacing * 5, pinSpacing * 5);
+		}
+		return body;
+	}
+
+	@Override
+	public void drawIcon(Graphics2D g2d, int width, int height) {
+		g2d.setColor(COLOR);
+
+		g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
+
+		g2d.drawLine(width / 4, height / 4, width * 3 / 4, height / 4);
+		g2d.drawLine(width / 2, height / 4, width / 2, 0);
+
+		g2d.drawLine(width / 4 + 2 * width / 32, height * 3 / 4, width * 3 / 4
+				- 4 * width / 32, height * 3 / 4);
+		g2d.drawLine(width / 4 + 2 * width / 32, height * 3 / 4, width / 4 + 2
+				* width / 32, height - 1);
+
+		g2d.drawOval(1, 1, width - 1 - 2 * width / 32, height - 1 - 2 * width
+				/ 32);
+
+		g2d.drawLine(0, height / 2, width / 8, height / 2);
+		g2d.setStroke(new BasicStroke(1f, BasicStroke.CAP_ROUND,
+				BasicStroke.JOIN_BEVEL, 0, new float[] { 3f }, 6f));
+		g2d.drawLine(width / 8, height / 2, width * 7 / 8, height / 2);
+	}
+
+	@Override
+	public Point getControlPoint(int index) {
+		return controlPoints[index];
+	}
+
+	@Override
+	public int getControlPointCount() {
+		return controlPoints.length;
+	}
+
+	protected void updateControlPoints() {
+		int pinSpacing = (int) PIN_SPACING.convertToPixels();
+		// Update control points.
+		int x = controlPoints[0].x;
+		int y = controlPoints[0].y;
+
+		controlPoints[1].x = x + pinSpacing * 3;
+		controlPoints[1].y = y - pinSpacing * 4;
+
+		controlPoints[2].x = x + pinSpacing * 2;
+		controlPoints[2].y = y + pinSpacing * 2;
+
+		controlPoints[3].x = x + pinSpacing * 6;
+		controlPoints[3].y = y - pinSpacing;
+
+		controlPoints[4].x = x;
+		controlPoints[4].y = y - pinSpacing * 2;
+
+		controlPoints[5].x = x + pinSpacing * 3;
+		controlPoints[5].y = y + pinSpacing * 2;
+
+		controlPoints[6].x = x + pinSpacing * 4;
+		controlPoints[6].y = y + pinSpacing * 2;
+	}
+
+	@Override
+	public void setControlPoint(Point point, int index) {
+		controlPoints[index].setLocation(point);
+		// Invalidate body
+		body = null;
+	}
+
+	@Override
+	public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
+		if (showHeaters) {
+			return !exposeSuppressorGrid && index == 4 ? VisibilityPolicy.NEVER
+					: VisibilityPolicy.WHEN_SELECTED;
+		} else {
+			return index >= 5 || (!exposeSuppressorGrid && index == 4) ? VisibilityPolicy.NEVER
+					: VisibilityPolicy.WHEN_SELECTED;
+		}
+	}
+
+	@Override
+	public boolean isControlPointSticky(int index) {
+		if (showHeaters) {
+			return exposeSuppressorGrid ? true : index != 4;
+		} else {
+			return exposeSuppressorGrid ? index < 5 : index < 4;
+		}
+	}
+
+	@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;
+	}
+
+	public void setExposeSuppressorGrid(boolean exposeSuppressorGrid) {
+		this.exposeSuppressorGrid = exposeSuppressorGrid;
+		this.body = null;
+	}
+}

diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/tube/TriodeSymbol.java

@@ -12,7 +12,7 @@ import org.diylc.core.IDIYComponent;
 import org.diylc.core.VisibilityPolicy;
 import org.diylc.core.annotations.ComponentDescriptor;
 
-@ComponentDescriptor(name = "Triode Symbol", author = "Branislav Stojkovic", category = "Tubes", instanceNamePrefix = "V", description = "Triode tube section", stretchable = false, zOrder = IDIYComponent.COMPONENT)
+@ComponentDescriptor(name = "Triode Symbol", author = "Branislav Stojkovic", category = "Tubes", instanceNamePrefix = "V", description = "Triode tube symbol", stretchable = false, zOrder = IDIYComponent.COMPONENT)
 public class TriodeSymbol extends AbstractTubeSymbol {
 
 	private static final long serialVersionUID = 1L;
@@ -114,14 +114,6 @@ public class TriodeSymbol extends AbstractTubeSymbol {
 		g2d.setStroke(new BasicStroke(1f, BasicStroke.CAP_ROUND,
 				BasicStroke.JOIN_BEVEL, 0, new float[] { 3f }, 6f));
 		g2d.drawLine(width / 8, height / 2, width * 7 / 8, height / 2);
-
-		// g2d.drawLine(width * 3 / 4, 1, width * 3 / 4, height / 4);
-		// g2d.drawLine(width / 3, height / 3 + 1, width * 3 / 4, height / 4);
-		//
-		// g2d.drawLine(width * 3 / 4, height - 1, width * 3 / 4, height * 3 /
-		// 4);
-		// g2d.drawLine(width / 3, height * 2 / 3 - 1, width * 3 / 4,
-		// height * 3 / 4);
 	}
 
 	@Override
@@ -173,7 +165,7 @@ public class TriodeSymbol extends AbstractTubeSymbol {
 	@Override
 	public boolean isControlPointSticky(int index) {
 		if (showHeaters) {
-			return index < 5;
+			return true;
 		} else {
 			return index < 3;
 		}