added abstract class for leaded schematic symbols and resistor symbol

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/CopperTrace.java

@@ -24,7 +24,7 @@ public class CopperTrace extends AbstractLeadedComponent<Void> {
 	public static Color COLOR = Color.black;
 
 	private Color leadColor = COLOR;
-	private Size leadThickness = THICKNESS;
+	private Size thickness = THICKNESS;
 
 	@Override
 	public void drawIcon(Graphics2D g2d, int width, int height) {
@@ -53,14 +53,18 @@ public class CopperTrace extends AbstractLeadedComponent<Void> {
 		this.leadColor = leadColor;
 	}
 
-	@Override
-	@EditableProperty(name = "Thickness")
-	public Size getLeadThickness() {
-		return leadThickness;
+	@EditableProperty(name = "Width")
+	public Size getThickness() {
+		return thickness;
 	}
 
-	public void setLeadThickness(Size leadThickness) {
-		this.leadThickness = leadThickness;
+	public void setThickness(Size thickness) {
+		this.thickness = thickness;
+	}
+	
+	@Override
+	protected int getLeadThickness() {
+		return getThickness().convertToPixels();
 	}
 
 	@Override

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/ResistorSymbol.java

@@ -0,0 +1,74 @@
+package org.diylc.components.passive;
+
+import java.awt.Graphics2D;
+import java.awt.Shape;
+import java.awt.geom.GeneralPath;
+
+import org.diylc.components.AbstractSchematicLeadedSymbol;
+import org.diylc.core.CreationMethod;
+import org.diylc.core.IDIYComponent;
+import org.diylc.core.annotations.ComponentDescriptor;
+import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.measures.Resistance;
+import org.diylc.core.measures.ResistanceUnit;
+import org.diylc.core.measures.Size;
+import org.diylc.core.measures.SizeUnit;
+
+@ComponentDescriptor(name = "Resistor (schematic symbol)", author = "Branislav Stojkovic", category = "Passive", creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "R", description = "", zOrder = IDIYComponent.COMPONENT)
+public class ResistorSymbol extends AbstractSchematicLeadedSymbol<Resistance> {
+
+	private static final long serialVersionUID = 1L;
+
+	public static Size DEFAULT_LENGTH = new Size(0.3, SizeUnit.in);
+	public static Size DEFAULT_WIDTH = new Size(0.08, SizeUnit.in);
+
+	private Resistance value = new Resistance(100d, ResistanceUnit.K);
+
+	@EditableProperty
+	public Resistance getValue() {
+		return value;
+	}
+
+	public void setValue(Resistance value) {
+		this.value = value;
+	}
+
+	public void drawIcon(Graphics2D g2d, int width, int height) {
+		g2d.rotate(-Math.PI / 4, width / 2, height / 2);
+		g2d.setColor(LEAD_COLOR);
+		g2d.drawLine(0, height / 2, 4, height / 2);
+		g2d.drawLine(width - 4, height / 2, width, height / 2);
+		g2d.setColor(COLOR);
+		g2d.drawPolyline(new int[] { 4, 6, 10, 14, 18, 22, 26, 28 }, new int[] { height / 2,
+				height / 2 + 2, height / 2 - 2, height / 2 + 2, height / 2 - 2, height / 2 + 2,
+				height / 2 - 2, height / 2 }, 8);
+	}
+
+	@Override
+	protected Size getDefaultWidth() {
+		return DEFAULT_WIDTH;
+	}
+
+	@Override
+	protected Size getDefaultLength() {
+		return DEFAULT_LENGTH;
+	}
+
+	@Override
+	protected Shape getBodyShape() {
+		GeneralPath polyline = new GeneralPath();
+		double length = getLength().convertToPixels();
+		double width = getWidth().convertToPixels();
+		polyline.moveTo(0, width / 2);
+		polyline.lineTo(length / 16, width);
+		polyline.lineTo(3 * length / 16, 0);
+		polyline.lineTo(5 * length / 16, width);
+		polyline.lineTo(7 * length / 16, 0);
+		polyline.lineTo(9 * length / 16, width);
+		polyline.lineTo(11 * length / 16, 0);
+		polyline.lineTo(13 * length / 16, width);
+		polyline.lineTo(15 * length / 16, 0);
+		polyline.lineTo(length, width / 2);
+		return polyline;
+	}
+}