Added TO-1

Added folded TO-92

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

@@ -0,0 +1,327 @@
+package org.diylc.components.semiconductors;
+
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Composite;
+import java.awt.FontMetrics;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.geom.Area;
+import java.awt.geom.Ellipse2D;
+import java.awt.geom.Rectangle2D;
+import java.awt.geom.RoundRectangle2D;
+
+import org.diylc.appframework.miscutils.ConfigurationManager;
+import org.diylc.common.Display;
+import org.diylc.common.IPlugInPort;
+import org.diylc.common.ObjectCache;
+import org.diylc.common.Orientation;
+import org.diylc.components.AbstractTransparentComponent;
+import org.diylc.core.ComponentState;
+import org.diylc.core.IDIYComponent;
+import org.diylc.core.IDrawingObserver;
+import org.diylc.core.Project;
+import org.diylc.core.Theme;
+import org.diylc.core.VisibilityPolicy;
+import org.diylc.core.annotations.ComponentDescriptor;
+import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.measures.Size;
+import org.diylc.core.measures.SizeUnit;
+import org.diylc.utils.Constants;
+
+@ComponentDescriptor(name = "Transistor (TO-1 package)", author = "Branislav Stojkovic", category = "Semiconductors", instanceNamePrefix = "Q", description = "Transistor with small metal body", stretchable = false, zOrder = IDIYComponent.COMPONENT)
+public class TransistorTO1 extends AbstractTransparentComponent<String> {
+
+	private static final long serialVersionUID = 1L;
+
+	public static Color BODY_COLOR = Color.decode("#D0E0EF");
+	public static Color BORDER_COLOR = BODY_COLOR.darker();
+	public static Color PIN_COLOR = Color.decode("#00B2EE");
+	public static Color PIN_BORDER_COLOR = PIN_COLOR.darker();
+	public static Color LABEL_COLOR = Color.black;
+	public static Size PIN_SIZE = new Size(0.03d, SizeUnit.in);
+	public static Size PIN_SPACING = new Size(0.05d, SizeUnit.in);
+	public static Size BODY_DIAMETER = new Size(0.24d, SizeUnit.in);
+	public static Size BODY_LENGTH = new Size(0.4d, SizeUnit.in);
+	public static Size EDGE_RADIUS = new Size(2d, SizeUnit.mm);
+
+	private String value = "";
+	private Orientation orientation = Orientation.DEFAULT;
+	private Point[] controlPoints = new Point[] { new Point(0, 0),
+			new Point(0, 0), new Point(0, 0) };
+	transient private Area body;
+	private Color bodyColor = BODY_COLOR;
+	private Color borderColor = BORDER_COLOR;
+	private Color labelColor = LABEL_COLOR;
+	protected Display display = Display.NAME;
+	private boolean folded = false;
+	private Size pinSpacing = PIN_SPACING;
+
+	public TransistorTO1() {
+		super();
+		updateControlPoints();
+	}
+
+	@EditableProperty
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	@EditableProperty
+	public Orientation getOrientation() {
+		return orientation;
+	}
+
+	public void setOrientation(Orientation orientation) {
+		this.orientation = orientation;
+		updateControlPoints();
+		// Reset body shape;
+		body = null;
+	}
+
+	@Override
+	public int getControlPointCount() {
+		return controlPoints.length;
+	}
+
+	@Override
+	public Point getControlPoint(int index) {
+		return controlPoints[index];
+	}
+
+	@Override
+	public boolean isControlPointSticky(int index) {
+		return true;
+	}
+
+	@Override
+	public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
+		return VisibilityPolicy.NEVER;
+	}
+
+	@Override
+	public void setControlPoint(Point point, int index) {
+		controlPoints[index].setLocation(point);
+		body = null;
+	}
+
+	private void updateControlPoints() {
+		int pinSpacing = (int) getPinSpacing().convertToPixels();
+		// Update control points.
+		int x = controlPoints[0].x;
+		int y = controlPoints[0].y;
+		switch (orientation) {
+		case DEFAULT:
+			controlPoints[1].setLocation(x - (folded ? 0 : pinSpacing), y
+					+ pinSpacing);
+			controlPoints[2].setLocation(x, y + 2 * pinSpacing);
+			break;
+		case _90:
+			controlPoints[1].setLocation(x - pinSpacing, y
+					- (folded ? 0 : pinSpacing));
+			controlPoints[2].setLocation(x - 2 * pinSpacing, y);
+			break;
+		case _180:
+			controlPoints[1].setLocation(x + (folded ? 0 : pinSpacing), y
+					- pinSpacing);
+			controlPoints[2].setLocation(x, y - 2 * pinSpacing);
+			break;
+		case _270:
+			controlPoints[1].setLocation(x + pinSpacing, y
+					+ (folded ? 0 : pinSpacing));
+			controlPoints[2].setLocation(x + 2 * pinSpacing, y);
+			break;
+		default:
+			throw new RuntimeException("Unexpected orientation: " + orientation);
+		}
+	}
+
+	public Area getBody() {
+		if (body == null) {
+			int x = (controlPoints[0].x + controlPoints[1].x + controlPoints[2].x) / 3;
+			int y = (controlPoints[0].y + controlPoints[1].y + controlPoints[2].y) / 3;
+			int bodyDiameter = getClosestOdd(BODY_DIAMETER.convertToPixels());
+			int bodyLength = getClosestOdd(BODY_LENGTH.convertToPixels());
+			int edgeRadius = (int) EDGE_RADIUS.convertToPixels();
+
+			if (folded) {
+				switch (orientation) {
+				case DEFAULT:
+					body = new Area(new RoundRectangle2D.Double(x - bodyLength, y - bodyDiameter / 2, bodyLength, bodyDiameter, edgeRadius, edgeRadius));
+					body.add(new Area(new Rectangle2D.Double(x - bodyLength / 2, y - bodyDiameter / 2, bodyLength / 2, bodyDiameter)));
+					break;
+				case _90:
+					body = new Area(new RoundRectangle2D.Double(x - bodyDiameter / 2, y - bodyLength, bodyDiameter, bodyLength, edgeRadius, edgeRadius));
+					body.add(new Area(new Rectangle2D.Double(x - bodyDiameter / 2, y - bodyLength / 2, bodyDiameter, bodyLength / 2)));
+					break;
+				case _180:
+					body = new Area(new RoundRectangle2D.Double(x, y - bodyDiameter / 2, bodyLength, bodyDiameter, edgeRadius, edgeRadius));
+					body.add(new Area(new Rectangle2D.Double(x, y - bodyDiameter / 2, bodyLength / 2, bodyDiameter)));
+					break;
+				case _270:
+					body = new Area(new RoundRectangle2D.Double(x - bodyDiameter / 2, y, bodyDiameter, bodyLength, edgeRadius, edgeRadius));
+					body.add(new Area(new Rectangle2D.Double(x - bodyDiameter / 2, y, bodyDiameter, bodyLength / 2)));
+					break;
+				default:
+					throw new RuntimeException("Unexpected orientation: " + orientation);
+				}
+			} else {
+				body = new Area(new Ellipse2D.Double(x - bodyDiameter / 2, y
+						- bodyDiameter / 2, bodyDiameter, bodyDiameter));
+			}
+
+		}
+		return body;
+	}
+
+	@Override
+	public void draw(Graphics2D g2d, ComponentState componentState,
+			boolean outlineMode, Project project,
+			IDrawingObserver drawingObserver) {
+		if (checkPointsClipped(g2d.getClip())) {
+			return;
+		}
+		int pinSize = (int) PIN_SIZE.convertToPixels() / 2 * 2;
+		Area mainArea = getBody();
+		Composite oldComposite = g2d.getComposite();
+		if (alpha < MAX_ALPHA) {
+			g2d.setComposite(AlphaComposite.getInstance(
+					AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
+		}
+		g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : bodyColor);
+		g2d.fill(mainArea);
+		g2d.setComposite(oldComposite);
+		Color finalBorderColor;
+		if (outlineMode) {
+			Theme theme = (Theme) ConfigurationManager.getInstance()
+					.readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
+			finalBorderColor = componentState == ComponentState.SELECTED
+					|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR
+					: theme.getOutlineColor();
+		} else {
+			finalBorderColor = componentState == ComponentState.SELECTED
+					|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR
+					: borderColor;
+		}
+		g2d.setColor(finalBorderColor);
+		g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
+		g2d.draw(mainArea);
+
+		if (!outlineMode) {
+			for (Point point : controlPoints) {
+				g2d.setColor(PIN_COLOR);
+				g2d.fillOval(point.x - pinSize / 2, point.y - pinSize / 2,
+						pinSize, pinSize);
+				g2d.setColor(PIN_BORDER_COLOR);
+				g2d.drawOval(point.x - pinSize / 2, point.y - pinSize / 2,
+						pinSize, pinSize);
+			}
+		}
+
+		// Draw label.
+		g2d.setFont(LABEL_FONT);
+		Color finalLabelColor;
+		if (outlineMode) {
+			Theme theme = (Theme) ConfigurationManager.getInstance()
+					.readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
+			finalLabelColor = componentState == ComponentState.SELECTED
+					|| componentState == ComponentState.DRAGGING ? LABEL_COLOR_SELECTED
+					: theme.getOutlineColor();
+		} else {
+			finalLabelColor = componentState == ComponentState.SELECTED
+					|| componentState == ComponentState.DRAGGING ? LABEL_COLOR_SELECTED
+					: getLabelColor();
+		}
+		g2d.setColor(finalLabelColor);
+		String label = (getDisplay() == Display.NAME) ? getName() : getValue();
+		FontMetrics fontMetrics = g2d.getFontMetrics(g2d.getFont());
+		Rectangle2D rect = fontMetrics.getStringBounds(label, g2d);
+		int textHeight = (int) (rect.getHeight());
+		int textWidth = (int) (rect.getWidth());
+		// Center text horizontally and vertically
+		Rectangle bounds = mainArea.getBounds();
+		int x = bounds.x + (bounds.width - textWidth) / 2;
+		int y = bounds.y + (bounds.height - textHeight) / 2
+				+ fontMetrics.getAscent();
+		g2d.drawString(label, x, y);
+	}
+
+	@Override
+	public void drawIcon(Graphics2D g2d, int width, int height) {
+		int margin = 2 * width / 32;
+		Area area = new Area(new Ellipse2D.Double(margin / 2, margin, width - 2
+				* margin, width - 2 * margin));
+		g2d.setColor(BODY_COLOR);
+		g2d.fill(area);
+		g2d.setColor(BORDER_COLOR);
+		g2d.draw(area);
+	}
+
+	@EditableProperty(name = "Body")
+	public Color getBodyColor() {
+		return bodyColor;
+	}
+
+	public void setBodyColor(Color bodyColor) {
+		this.bodyColor = bodyColor;
+	}
+
+	@EditableProperty
+	public boolean getFolded() {
+		return folded;
+	}
+
+	public void setFolded(boolean folded) {
+		this.folded = folded;
+		updateControlPoints();
+		// Reset body shape;
+		body = null;
+	}
+	
+	@EditableProperty
+	public Size getPinSpacing() {
+		return pinSpacing;
+	}
+	
+	public void setPinSpacing(Size pinSpacing) {
+		this.pinSpacing = pinSpacing;
+		updateControlPoints();
+		// Reset body shape;
+		body = null;
+	}
+
+	@EditableProperty(name = "Border")
+	public Color getBorderColor() {
+		return borderColor;
+	}
+
+	public void setBorderColor(Color borderColor) {
+		this.borderColor = borderColor;
+	}
+	
+	@EditableProperty(name = "Label")
+	public Color getLabelColor() {
+		return labelColor;
+	}
+	
+	public void setLabelColor(Color labelColor) {
+		this.labelColor = labelColor;
+	}
+
+	@EditableProperty
+	public Display getDisplay() {
+		if (display == null) {
+			display = Display.NAME;
+		}
+		return display;
+	}
+
+	public void setDisplay(Display display) {
+		this.display = display;
+	}
+}

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

@@ -40,16 +40,20 @@ public class TransistorTO92 extends AbstractTransparentComponent<String> {
 	public static Color PIN_BORDER_COLOR = PIN_COLOR.darker();
 	public static Color LABEL_COLOR = Color.white;
 	public static Size PIN_SIZE = new Size(0.03d, SizeUnit.in);
-	public static Size PIN_SPACING = new Size(0.1d, SizeUnit.in);
+	public static Size PIN_SPACING = new Size(0.05d, SizeUnit.in);
 	public static Size BODY_DIAMETER = new Size(0.2d, SizeUnit.in);
 
 	private String value = "";
 	private Orientation orientation = Orientation.DEFAULT;
-	private Point[] controlPoints = new Point[] { new Point(0, 0), new Point(0, 0), new Point(0, 0) };
+	private Point[] controlPoints = new Point[] { new Point(0, 0),
+			new Point(0, 0), new Point(0, 0) };
 	transient private Area body;
 	private Color bodyColor = BODY_COLOR;
 	private Color borderColor = BORDER_COLOR;
+	private Color labelColor = LABEL_COLOR;
 	protected Display display = Display.NAME;
+	private boolean folded = false;
+	private Size pinSpacing = PIN_SPACING;
 
 	public TransistorTO92() {
 		super();
@@ -77,6 +81,32 @@ public class TransistorTO92 extends AbstractTransparentComponent<String> {
 		body = null;
 	}
 
+	@EditableProperty
+	public boolean getFolded() {
+		return folded;
+	}
+
+	public void setFolded(boolean folded) {
+		this.folded = folded;
+		// Reset body shape;
+		body = null;
+	}
+	
+	@EditableProperty
+	public Size getPinSpacing() {
+		if (pinSpacing == null) {
+			pinSpacing = new Size(0.1, SizeUnit.in);
+		}
+		return pinSpacing;
+	}
+	
+	public void setPinSpacing(Size pinSpacing) {
+		this.pinSpacing = pinSpacing;
+		updateControlPoints();
+		// Reset body shape;
+		body = null;
+	}
+
 	@Override
 	public int getControlPointCount() {
 		return controlPoints.length;
@@ -104,7 +134,7 @@ public class TransistorTO92 extends AbstractTransparentComponent<String> {
 	}
 
 	private void updateControlPoints() {
-		int pinSpacing = (int) PIN_SPACING.convertToPixels();
+		int pinSpacing = (int) getPinSpacing().convertToPixels();
 		// Update control points.
 		int x = controlPoints[0].x;
 		int y = controlPoints[0].y;
@@ -132,46 +162,77 @@ public class TransistorTO92 extends AbstractTransparentComponent<String> {
 
 	public Area getBody() {
 		if (body == null) {
-			int x = controlPoints[0].x;
+			int x = (controlPoints[0].x + controlPoints[1].x + controlPoints[2].x) / 3;
-			int y = controlPoints[0].y;
+			int y = (controlPoints[0].y + controlPoints[1].y + controlPoints[2].y) / 3;
-			int pinSpacing = (int) PIN_SPACING.convertToPixels();
 			int bodyDiameter = getClosestOdd(BODY_DIAMETER.convertToPixels());
 
+			if (folded) {
 				switch (orientation) {
 				case DEFAULT:
-				body = new Area(new Ellipse2D.Double(x - bodyDiameter / 2, y + pinSpacing
+					body = new Area(new Rectangle2D.Double(x - bodyDiameter, y
 							- bodyDiameter / 2, bodyDiameter, bodyDiameter));
-				body.subtract(new Area(new Rectangle2D.Double(x - bodyDiameter, y + pinSpacing
-						- bodyDiameter / 2, 3 * bodyDiameter / 4, bodyDiameter)));
 					break;
 				case _90:
-				body = new Area(new Ellipse2D.Double(x - pinSpacing - bodyDiameter / 2, y
+					body = new Area(new Rectangle2D.Double(
-						- bodyDiameter / 2, bodyDiameter, bodyDiameter));
+							x - bodyDiameter / 2, y - bodyDiameter,
-				body.subtract(new Area(new Rectangle2D.Double(x - pinSpacing - bodyDiameter / 2, y
+							bodyDiameter, bodyDiameter));
-						- bodyDiameter, bodyDiameter, 3 * bodyDiameter / 4)));
 					break;
 				case _180:
-				body = new Area(new Ellipse2D.Double(x - bodyDiameter / 2, y - pinSpacing
+					body = new Area(new Rectangle2D.Double(x, y - bodyDiameter
-						- bodyDiameter / 2, bodyDiameter, bodyDiameter));
+							/ 2, bodyDiameter, bodyDiameter));
-				body.subtract(new Area(new Rectangle2D.Double(x + bodyDiameter / 4, y - pinSpacing
-						- bodyDiameter / 2, 3 * bodyDiameter / 4, bodyDiameter)));
 					break;
 				case _270:
-				body = new Area(new Ellipse2D.Double(x + pinSpacing - bodyDiameter / 2, y
+					body = new Area(
-						- bodyDiameter / 2, bodyDiameter, bodyDiameter));
+							new Rectangle2D.Double(x - bodyDiameter / 2, y,
-				body.subtract(new Area(new Rectangle2D.Double(x + pinSpacing - bodyDiameter / 2, y
+									bodyDiameter, bodyDiameter));
-						+ bodyDiameter / 4, bodyDiameter, 3 * bodyDiameter / 4)));
 					break;
 				default:
-				throw new RuntimeException("Unexpected orientation: " + orientation);
+					throw new RuntimeException("Unexpected orientation: "
+							+ orientation);
+				}
+			} else {
+				switch (orientation) {
+				case DEFAULT:
+					body = new Area(new Ellipse2D.Double(x - bodyDiameter / 2,
+							y - bodyDiameter / 2, bodyDiameter, bodyDiameter));
+					body.subtract(new Area(new Rectangle2D.Double(x
+							- bodyDiameter, y - bodyDiameter / 2,
+							3 * bodyDiameter / 4, bodyDiameter)));
+					break;
+				case _90:
+					body = new Area(new Ellipse2D.Double(x - bodyDiameter / 2,
+							y - bodyDiameter / 2, bodyDiameter, bodyDiameter));
+					body.subtract(new Area(new Rectangle2D.Double(x
+							- bodyDiameter / 2, y - bodyDiameter, bodyDiameter,
+							3 * bodyDiameter / 4)));
+					break;
+				case _180:
+					body = new Area(new Ellipse2D.Double(x - bodyDiameter / 2,
+							y - bodyDiameter / 2, bodyDiameter, bodyDiameter));
+					body.subtract(new Area(new Rectangle2D.Double(x
+							+ bodyDiameter / 4, y - bodyDiameter / 2,
+							3 * bodyDiameter / 4, bodyDiameter)));
+					break;
+				case _270:
+					body = new Area(new Ellipse2D.Double(x - bodyDiameter / 2,
+							y - bodyDiameter / 2, bodyDiameter, bodyDiameter));
+					body.subtract(new Area(new Rectangle2D.Double(x
+							- bodyDiameter / 2, y + bodyDiameter / 4,
+							bodyDiameter, 3 * bodyDiameter / 4)));
+					break;
+				default:
+					throw new RuntimeException("Unexpected orientation: "
+							+ orientation);
+				}
 			}
 		}
 		return body;
 	}
 
 	@Override
-	public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode,
+	public void draw(Graphics2D g2d, ComponentState componentState,
-			Project project, IDrawingObserver drawingObserver) {
+			boolean outlineMode, Project project,
+			IDrawingObserver drawingObserver) {
 		if (checkPointsClipped(g2d.getClip())) {
 			return;
 		}
@@ -179,22 +240,23 @@ public class TransistorTO92 extends AbstractTransparentComponent<String> {
 		Area mainArea = getBody();
 		Composite oldComposite = g2d.getComposite();
 		if (alpha < MAX_ALPHA) {
-			g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha
+			g2d.setComposite(AlphaComposite.getInstance(
-					/ MAX_ALPHA));
+					AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
 		}
 		g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : bodyColor);
 		g2d.fill(mainArea);
 		g2d.setComposite(oldComposite);
 		Color finalBorderColor;
 		if (outlineMode) {
-			Theme theme = (Theme) ConfigurationManager.getInstance().readObject(
+			Theme theme = (Theme) ConfigurationManager.getInstance()
-					IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
+					.readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
 			finalBorderColor = componentState == ComponentState.SELECTED
-					|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : theme
+					|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR
-					.getOutlineColor();
+					: theme.getOutlineColor();
 		} else {
 			finalBorderColor = componentState == ComponentState.SELECTED
-					|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : borderColor;
+					|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR
+					: borderColor;
 		}
 		g2d.setColor(finalBorderColor);
 		g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
@@ -203,9 +265,11 @@ public class TransistorTO92 extends AbstractTransparentComponent<String> {
 		if (!outlineMode) {
 			for (Point point : controlPoints) {
 				g2d.setColor(PIN_COLOR);
-				g2d.fillOval(point.x - pinSize / 2, point.y - pinSize / 2, pinSize, pinSize);
+				g2d.fillOval(point.x - pinSize / 2, point.y - pinSize / 2,
+						pinSize, pinSize);
 				g2d.setColor(PIN_BORDER_COLOR);
-				g2d.drawOval(point.x - pinSize / 2, point.y - pinSize / 2, pinSize, pinSize);
+				g2d.drawOval(point.x - pinSize / 2, point.y - pinSize / 2,
+						pinSize, pinSize);
 			}
 		}
 
@@ -213,15 +277,15 @@ public class TransistorTO92 extends AbstractTransparentComponent<String> {
 		g2d.setFont(LABEL_FONT);
 		Color finalLabelColor;
 		if (outlineMode) {
-			Theme theme = (Theme) ConfigurationManager.getInstance().readObject(
+			Theme theme = (Theme) ConfigurationManager.getInstance()
-					IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
+					.readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
 			finalLabelColor = componentState == ComponentState.SELECTED
-					|| componentState == ComponentState.DRAGGING ? LABEL_COLOR_SELECTED : theme
+					|| componentState == ComponentState.DRAGGING ? LABEL_COLOR_SELECTED
-					.getOutlineColor();
+					: theme.getOutlineColor();
 		} else {
 			finalLabelColor = componentState == ComponentState.SELECTED
 					|| componentState == ComponentState.DRAGGING ? LABEL_COLOR_SELECTED
-					: LABEL_COLOR;
+					: getLabelColor();
 		}
 		g2d.setColor(finalLabelColor);
 		String label = (getDisplay() == Display.NAME) ? getName() : getValue();
@@ -232,18 +296,20 @@ public class TransistorTO92 extends AbstractTransparentComponent<String> {
 		// Center text horizontally and vertically
 		Rectangle bounds = mainArea.getBounds();
 		int x = bounds.x + (bounds.width - textWidth) / 2;
-		int y = bounds.y + (bounds.height - textHeight) / 2 + fontMetrics.getAscent();
+		int y = bounds.y + (bounds.height - textHeight) / 2
+				+ fontMetrics.getAscent();
 		g2d.drawString(label, x, y);
 	}
 
 	@Override
 	public void drawIcon(Graphics2D g2d, int width, int height) {
 		int margin = 3 * width / 32;
-		Area area = new Area(new Ellipse2D.Double(margin / 2, margin, width - 2 * margin, width - 2
+		Area area = new Area(new Ellipse2D.Double(margin / 2, margin, width - 2
-				* margin));
+				* margin, width - 2 * margin));
 		// area.subtract(new Area(new Rectangle2D.Double(0, 0, 2 * margin,
 		// height)));
-		area.intersect(new Area(new Rectangle2D.Double(2 * margin, 0, width, height)));
+		area.intersect(new Area(new Rectangle2D.Double(2 * margin, 0, width,
+				height)));
 		g2d.setColor(BODY_COLOR);
 		g2d.fill(area);
 		g2d.setColor(BORDER_COLOR);
@@ -268,6 +334,18 @@ public class TransistorTO92 extends AbstractTransparentComponent<String> {
 		this.borderColor = borderColor;
 	}
 	
+	@EditableProperty(name = "Label")
+	public Color getLabelColor() {
+		if (labelColor == null) {
+			labelColor = LABEL_COLOR;
+		}
+		return labelColor;
+	}
+	
+	public void setLabelColor(Color labelColor) {
+		this.labelColor = labelColor;
+	}
+
 	@EditableProperty
 	public Display getDisplay() {
 		if (display == null) {