config.xml

@@ -1,86 +0,0 @@
-<map>
-  <entry>
-    <string>default.org.diylc.components.passive.TrimmerPotentiometer:Type</string>
-    <org.diylc.components.passive.TrimmerPotentiometer_-TrimmerType>FLAT_LARGE</org.diylc.components.passive.TrimmerPotentiometer_-TrimmerType>
-  </entry>
-  <entry>
-    <string>lastPath</string>
-    <string>C:\Documents and Settings\Branislav Stojkovic\My Documents\Downloads</string>
-  </entry>
-  <entry>
-    <string>abnormalExit</string>
-    <boolean>false</boolean>
-  </entry>
-  <entry>
-    <string>stickyPoints</string>
-    <boolean>true</boolean>
-  </entry>
-  <entry>
-    <string>theme</string>
-    <org.diylc.core.Theme>
-      <name>Light</name>
-      <bgColor>
-        <red>255</red>
-        <green>255</green>
-        <blue>255</blue>
-        <alpha>255</alpha>
-      </bgColor>
-      <gridColor>
-        <red>240</red>
-        <green>240</green>
-        <blue>240</blue>
-        <alpha>240</alpha>
-      </gridColor>
-      <outlineColor>
-        <red>0</red>
-        <green>0</green>
-        <blue>0</blue>
-        <alpha>255</alpha>
-      </outlineColor>
-    </org.diylc.core.Theme>
-  </entry>
-  <entry>
-    <string>antiAliasing</string>
-    <boolean>true</boolean>
-  </entry>
-  <entry>
-    <string>snapToGrid</string>
-    <boolean>true</boolean>
-  </entry>
-  <entry>
-    <string>hiQualityRender</string>
-    <boolean>false</boolean>
-  </entry>
-  <entry>
-    <string>outline</string>
-    <boolean>true</boolean>
-  </entry>
-  <entry>
-    <string>exportGrid</string>
-    <boolean>true</boolean>
-  </entry>
-  <entry>
-    <string>autoEdit</string>
-    <boolean>false</boolean>
-  </entry>
-  <entry>
-    <string>wheelZoom</string>
-    <boolean>false</boolean>
-  </entry>
-  <entry>
-    <string>default.org.diylc.components.misc.Label:Font Bold</string>
-    <boolean>false</boolean>
-  </entry>
-  <entry>
-    <string>autoCreatePads</string>
-    <boolean>true</boolean>
-  </entry>
-  <entry>
-    <string>continuousCreation</string>
-    <boolean>true</boolean>
-  </entry>
-  <entry>
-    <string>showTemplatesAtStartup</string>
-    <boolean>false</boolean>
-  </entry>
-</map>

diylc-core/.classpath

@@ -12,6 +12,6 @@
 	<classpathentry kind="lib" path="lib/jettison-1.0.1.jar"/>
 	<classpathentry kind="lib" path="lib/poi-3.5-FINAL-20090928.jar"/>
 	<classpathentry kind="lib" path="library/main.jar"/>
-	<classpathentry kind="lib" path="lib/bancika-gui-framework.jar"/>
+	<classpathentry kind="lib" path="lib/app-framework.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

diylc-core/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>DIYLC</name>
+	<name>diylc-core</name>
 	<comment></comment>
 	<projects>
 	</projects>

diylc-core/build.xml

@@ -0,0 +1,82 @@
+<project name="diylc-core" basedir="." default="jar">
+	<property name="src.dir" value="src" />
+
+	<property name="lib.dir" value="${basedir}/lib" />
+	<property name="build.dir" value="${basedir}/build" />
+	<property name="jar.dir" value="${build.dir}/jar" />
+	<property name="report.dir" value="${build.dir}/junitreport" />
+
+	<property name="classes.dir" value="${build.dir}/temp/${ant.project.name}/classes" />
+	<property name="test.classes.dir" value="${build.dir}/temp/${ant.project.name}/test.classes" />
+
+	<target name="clean">
+		<delete dir="${build.dir}" />
+	</target>
+
+	<!--change src dir-->
+	<target name="compile">
+		<mkdir dir="${classes.dir}" />
+		<echo>Compile with JDK ${java.runtime.version}</echo>
+		<javac encoding="8859_1" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="class.path" />
+	</target>
+
+	<target name="resource.copy">
+		<copy todir="${classes.dir}">
+			<fileset dir="${src.dir}">
+				<exclude name="**/*.java" />
+			</fileset>
+		</copy>
+	</target>
+
+	<target name="lib.copy">
+		<copy todir="${jar.dir}/lib" overwrite="true">
+			<fileset dir="${basedir}/lib">
+				<exclude name="**/*dll" />
+			</fileset>
+		</copy>
+		<copy todir="${jar.dir}/library" overwrite="true">
+			<fileset dir="${basedir}/library">
+				<exclude name="**/*dll" />
+			</fileset>
+		</copy>
+		<copy todir="${jar.dir}" overwrite="true">
+			<fileset dir="${basedir}/lib/" includes="**/*.dll" />
+		</copy>
+	</target>
+
+	<path id="class.path">
+		<fileset dir="${basedir}">
+			<include name="lib/**/*.jar" />
+			<include name="library/**/*.jar" />
+		</fileset>
+	</path>
+
+	<manifestclasspath jarfile="${ant.project.name}.jar" property="manifest.class.path">
+		<classpath refid="class.path" />
+	</manifestclasspath>
+
+	<target name="jar" depends="clean, lib.copy, resource.copy, compile">
+		<jar destfile="${jar.dir}/${ant.project.name}.jar" basedir="${classes.dir}">
+			<manifest>
+				<attribute name="Built-By" value="${user.name}" />
+				<attribute name="Class-Path" value="${manifest.class.path}" />
+			</manifest>
+		</jar>
+		<copy todir="../diylc-swing/lib" overwrite="true">
+			<fileset dir="${jar.dir}" includes="${ant.project.name}.jar" />
+		</copy>
+		<copy todir="../diylc-library/lib" overwrite="true">
+			<fileset dir="${jar.dir}" includes="${ant.project.name}.jar" />
+		</copy>
+	</target>
+
+	<target name="javadoc">
+		<javadoc access="public" author="true" classpathref="class.path" destdir="doc" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.6" splitindex="true" use="true" version="true">
+			<fileset dir="${src.dir}">
+				<exclude name="**\.svn\**" />
+				<include name="**/*.java" />
+			</fileset>
+		</javadoc>
+	</target>
+
+</project>

diylc-core/src/org/diylc/common/HorizontalAlignment.java

@@ -0,0 +1,5 @@
+package org.diylc.common;
+
+public enum HorizontalAlignment {
+	LEFT, CENTER, RIGHT
+}

diylc-core/src/org/diylc/common/IMouseProcessor.java

@@ -0,0 +1,68 @@
+package org.diylc.common;
+
+import java.awt.Point;
+
+public interface IMouseProcessor {
+
+	/**
+	 * Notifies the presenter that mouse is clicked.
+	 * 
+	 * Note: point coordinates are display based, i.e. scaled for zoom factor.
+	 * 
+	 * @param point
+	 * @param ctrlDown
+	 * @param shiftDown
+	 * @param altDown
+	 * @param clickCount
+	 */
+	void mouseClicked(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown,
+			int clickCount);
+
+	/**
+	 * Notifies the presenter that mouse is moved.
+	 * 
+	 * Note: point coordinates are display based, i.e. scaled for zoom factor.
+	 * 
+	 * @param point
+	 * @param ctrlDown
+	 * @param shiftDown
+	 * @param altDown
+	 */
+	void mouseMoved(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown);
+
+	/**
+	 * Notification that drag has been started from the specified point.
+	 * 
+	 * Note: point coordinates are scaled for zoom factor.
+	 * 
+	 * @param point
+	 * @param dragAction
+	 */
+	void dragStarted(Point point, int dragAction);
+
+	/**
+	 * Checks if it's possible to drop over the specified point.
+	 * 
+	 * Note: point coordinates are scaled for zoom factor.
+	 * 
+	 * @param point
+	 * @return
+	 */
+	boolean dragOver(Point point);
+
+	/**
+	 * Changes the current drag action during the dragging.
+	 * 
+	 * @param dragAction
+	 */
+	void dragActionChanged(int dragAction);
+
+	/**
+	 * Notification that drag has been ended in the specified point.
+	 * 
+	 * Note: point coordinates are scaled for zoom factor.
+	 * 
+	 * @param point
+	 */
+	void dragEnded(Point point);
+}

diylc-core/src/org/diylc/common/IPlugIn.java

@@ -1,6 +1,6 @@
 package org.diylc.common;
 
-import com.diyfever.gui.simplemq.IMessageListener;
+import org.diylc.appframework.simplemq.IMessageListener;
 
 /**
  * Interface for plug-ins.

diylc-core/src/org/diylc/common/IPlugInPort.java

@@ -9,14 +9,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.diylc.appframework.simplemq.IMessageListener;
+import org.diylc.appframework.simplemq.MessageDispatcher;
+import org.diylc.appframework.update.VersionNumber;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.Project;
 import org.diylc.core.Theme;
-import org.diylc.swing.plugins.edit.ComponentTransferable;
-
-import com.diyfever.gui.simplemq.IMessageListener;
-import com.diyfever.gui.simplemq.MessageDispatcher;
-import com.diyfever.gui.update.VersionNumber;
 
 /**
  * Interface for communication between plug-ins and the application. Plug-ins
@@ -30,7 +28,7 @@ import com.diyfever.gui.update.VersionNumber;
  * @see IMessageListener
  * @see EventType
  */
-public interface IPlugInPort {
+public interface IPlugInPort extends ISelectionProcessor, IMouseProcessor {
 
 	public static final String ANTI_ALIASING_KEY = "antiAliasing";
 	public static final String HI_QUALITY_RENDER_KEY = "hiQualityRender";
@@ -47,6 +45,9 @@ public interface IPlugInPort {
 	public static final String THEME_KEY = "theme";
 	public static final String RECENT_COMPONENTS_KEY = "recentComponents";
 
+	public static final int DND_TOGGLE_STICKY = 0x1;
+	public static final int DND_TOGGLE_SNAP = 0x40000000;
+
 	/**
 	 * Returns size of the canvas that takes project dimensions into account as
 	 * well as zoom level. Each dimension is calculated as the product of the
@@ -161,84 +162,6 @@ public interface IPlugInPort {
 	 */
 	void setZoomLevel(double zoomLevel);
 
-	/**
-	 * Notifies the presenter that mouse is clicked.
-	 * 
-	 * Note: point coordinates are display based, i.e. scaled for zoom factor.
-	 * 
-	 * @param point
-	 * @param ctrlDown
-	 * @param shiftDown
-	 * @param altDown
-	 * @param clickCount
-	 */
-	void mouseClicked(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown,
-			int clickCount);
-
-	/**
-	 * Notifies the presenter that mouse is moved.
-	 * 
-	 * Note: point coordinates are display based, i.e. scaled for zoom factor.
-	 * 
-	 * @param point
-	 * @param ctrlDown
-	 * @param shiftDown
-	 * @param altDown
-	 */
-	void mouseMoved(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown);
-
-	/**
-	 * Returns the current {@link ComponentTransferable}.
-	 * 
-	 * @return
-	 */
-	List<IDIYComponent<?>> getSelectedComponents();
-
-	/**
-	 * Updates the selection with the specified list of component. Also, updates
-	 * control point map with all components that are stuck to the newly
-	 * selected components.
-	 * 
-	 * @param newSelection
-	 */
-	void updateSelection(List<IDIYComponent<?>> newSelection);
-
-	/**
-	 * Selects all components in the project.
-	 */
-	void selectAll();
-
-	/**
-	 * Notification that drag has been started from the specified point.
-	 * 
-	 * Note: point coordinates are scaled for zoom factor.
-	 * 
-	 * @param point
-	 * @param ctrlDown
-	 * @param shiftDown
-	 * @param altDown
-	 */
-	void dragStarted(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown);
-
-	/**
-	 * Checks if it's possible to drop over the specified point.
-	 * 
-	 * Note: point coordinates are scaled for zoom factor.
-	 * 
-	 * @param point
-	 * @return
-	 */
-	boolean dragOver(Point point);
-
-	/**
-	 * Notification that drag has been ended in the specified point.
-	 * 
-	 * Note: point coordinates are scaled for zoom factor.
-	 * 
-	 * @param point
-	 */
-	void dragEnded(Point point);
-
 	/**
 	 * Returns current version number.
 	 * 

diylc-core/src/org/diylc/common/ISelectionProcessor.java

@@ -0,0 +1,39 @@
+package org.diylc.common;
+
+import java.awt.Point;
+import java.util.List;
+
+import org.diylc.core.IDIYComponent;
+
+public interface ISelectionProcessor {
+
+	/**
+	 * Returns the current {@link ComponentTransferable}.
+	 * 
+	 * @return
+	 */
+	List<IDIYComponent<?>> getSelectedComponents();
+
+	/**
+	 * Updates the selection with the specified list of component. Also, updates
+	 * control point map with all components that are stuck to the newly
+	 * selected components.
+	 * 
+	 * @param newSelection
+	 */
+	void updateSelection(List<IDIYComponent<?>> newSelection);
+
+	/**
+	 * Finds all components at the specified location, sorted by z-index from
+	 * top to bottom.
+	 * 
+	 * @param point
+	 * @return
+	 */
+	List<IDIYComponent<?>> findComponentsAt(Point point);
+
+	/**
+	 * Selects all components in the project.
+	 */
+	void selectAll();
+}

diylc-core/src/org/diylc/common/VerticalAlignment.java

@@ -0,0 +1,5 @@
+package org.diylc.common;
+
+public enum VerticalAlignment {
+	TOP, CENTER, BOTTOM
+}

diylc-core/src/org/diylc/components/AbstractComponent.java

@@ -2,8 +2,15 @@ package org.diylc.components;
 
 import java.awt.Color;
 import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
 import java.awt.Shape;
+import java.awt.font.FontRenderContext;
+import java.awt.font.GlyphVector;
 
+import org.diylc.common.HorizontalAlignment;
+import org.diylc.common.VerticalAlignment;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.annotations.EditableProperty;
 
@@ -70,4 +77,43 @@ public abstract class AbstractComponent<T> implements IDIYComponent<T> {
 		}
 		return true;
 	}
+
+	protected void drawCenteredText(Graphics2D g2d, String text, int x, int y,
+			HorizontalAlignment horizontalAlignment, VerticalAlignment verticalAlignment) {
+		FontMetrics fontMetrics = g2d.getFontMetrics();
+		Rectangle stringBounds = fontMetrics.getStringBounds(text, g2d).getBounds();
+
+		Font font = g2d.getFont();
+		FontRenderContext renderContext = g2d.getFontRenderContext();
+		GlyphVector glyphVector = font.createGlyphVector(renderContext, text);
+		Rectangle visualBounds = glyphVector.getVisualBounds().getBounds();
+
+		int textX = 0;
+		switch (horizontalAlignment) {
+		case CENTER:
+			textX = x - stringBounds.width / 2;
+			break;
+		case LEFT:
+			textX = x;
+			break;
+		case RIGHT:
+			textX = x - stringBounds.width;
+			break;
+		}
+
+		int textY = 0;
+		switch (verticalAlignment) {
+		case TOP:
+			textY = y + stringBounds.height;
+			break;
+		case CENTER:
+			textY = y - visualBounds.height / 2 - visualBounds.y;
+			break;
+		case BOTTOM:
+			textY = y - visualBounds.y;
+			break;
+		}
+
+		g2d.drawString(text, textX, textY);
+	}
 }

diylc-core/src/org/diylc/components/AbstractLeadedComponent.java

@@ -12,6 +12,7 @@ import java.awt.geom.AffineTransform;
 import java.awt.geom.Ellipse2D;
 import java.awt.geom.Rectangle2D;
 
+import org.diylc.appframework.miscutils.ConfigurationManager;
 import org.diylc.common.Display;
 import org.diylc.common.IPlugInPort;
 import org.diylc.common.ObjectCache;
@@ -25,8 +26,6 @@ import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 import org.diylc.utils.Constants;
 
-import com.diyfever.gui.miscutils.ConfigurationManager;
-
 /**
  * Base class for all leaded components such as resistors or capacitors. Has two
  * control points and draws leads between them. Also, it positions and draws the
@@ -144,35 +143,14 @@ public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComp
 			}
 			g2d.setColor(finalBorderColor);
 			g2d.draw(shape);
-			// 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
-						: labelColor;
-			}
-			g2d.setColor(finalLabelColor);
-			FontMetrics fontMetrics = g2d.getFontMetrics();
-			String label = display == Display.NAME ? getName() : getValue().toString();
-			// Adjust label angle if needed to make sure that it's readable.
-			if ((theta >= Math.PI / 2 && theta <= Math.PI)
-					|| (theta < -Math.PI / 2 && theta > -Math.PI)) {
-				g2d.rotate(Math.PI, shapeRect.width / 2, shapeRect.height / 2);
-			}
-			Rectangle2D textRect = fontMetrics.getStringBounds(label, g2d);
-			g2d.drawString(label, (int) (shapeRect.width - textRect.getWidth()) / 2,
-					calculateLabelYCoordinate(shapeRect, textRect, fontMetrics));
-
+			
 			// Go back to the original transformation to draw leads.
 			if (!outlineMode) {
+				AffineTransform textTransform = g2d.getTransform();
 				g2d.setTransform(oldTransform);
+				if (length.convertToPixels() > points[0].distance(points[1])) {
+					g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.5f));
+				}
 				int leadThickness = getClosestOdd(getLeadThickness());
 				double leadLength = (distance - shapeRect.width) / 2 - leadThickness / 2;
 				g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness));
@@ -196,7 +174,39 @@ public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComp
 							* leadLength), (int) (points[1].y + Math.sin(theta - Math.PI)
 							* leadLength));
 				}
+				g2d.setComposite(oldComposite);
+				g2d.setTransform(textTransform);
 			}
+			
+			// 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
+						: labelColor;
+			}
+			g2d.setColor(finalLabelColor);
+			FontMetrics fontMetrics = g2d.getFontMetrics();
+			String label = display == Display.NAME ? getName() : getValue().toString();
+			Rectangle2D textRect = fontMetrics.getStringBounds(label, g2d);
+			// Don't offset in outline mode.
+			int offset = outlineMode ? 0 : getLabelOffset((int) shapeRect.getWidth(), (int) textRect.getWidth());
+			// Adjust label angle if needed to make sure that it's readable.
+			if ((theta >= Math.PI / 2 && theta <= Math.PI)
+					|| (theta < -Math.PI / 2 && theta > -Math.PI)) {
+				g2d.rotate(Math.PI, shapeRect.width / 2, shapeRect.height / 2);
+				offset = -offset;
+			}			
+			g2d.drawString(label, (int) (shapeRect.width - textRect.getWidth()) / 2 + offset,
+					calculateLabelYCoordinate(shapeRect, textRect, fontMetrics));
+			g2d.setTransform(oldTransform);
 		}
 	}
 
@@ -230,6 +240,10 @@ public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComp
 	protected boolean supportsStandingMode() {
 		return false;
 	}
+	
+	protected int getLabelOffset(int bodyWidth, int labelWidth) {
+		return 0;
+	}
 
 	/**
 	 * @return default component length.

diylc-core/src/org/diylc/core/Project.java

@@ -6,13 +6,12 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.diylc.appframework.update.VersionNumber;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.annotations.PositiveMeasureValidator;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 
-import com.diyfever.gui.update.VersionNumber;
-
 /**
  * Entity class that defines a project. Contains project properties and a
  * collection of components.This class is serialized to file. Some filed getters
@@ -202,8 +201,8 @@ public class Project implements Serializable {
 		public void validate(Object value) throws ValidationException {
 			super.validate(value);
 			Size size = (Size) value;
-			if (size.compareTo(new Size(1d, SizeUnit.mm)) < 0) {
-				throw new ValidationException("must be greater than 1mm");
+			if (size.compareTo(new Size(0.5d, SizeUnit.mm)) < 0) {
+				throw new ValidationException("must be at least 0.5mm");
 			}
 			if (size.compareTo(new Size(1d, SizeUnit.in)) > 0) {
 				throw new ValidationException("must be less than 1in");

diylc-core/src/org/diylc/core/measures/AbstractMeasure.java

@@ -76,6 +76,6 @@ public class AbstractMeasure<T extends Enum<? extends Unit>> implements Serializ
 
 	@Override
 	public String toString() {
-		return format.format(value) + " " + unit;
+		return format.format(value) + unit;
 	}
 }

diylc-core/src/org/diylc/core/measures/Power.java

@@ -0,0 +1,31 @@
+package org.diylc.core.measures;
+
+public class Power extends AbstractMeasure<PowerUnit> {
+
+	private static final long serialVersionUID = 1L;
+
+	public Power() {
+		super();
+		// TODO Auto-generated constructor stub
+	}
+
+	public Power(Double value, PowerUnit unit) {
+		super(value, unit);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public Power clone() throws CloneNotSupportedException {
+		return new Power(value, unit);
+	}
+
+	public static Power parseCapacitance(String value) {
+		for (PowerUnit unit : PowerUnit.values()) {
+			if (value.toLowerCase().endsWith(unit.toString().toLowerCase())) {
+				value = value.substring(0, value.length() - unit.toString().length() - 1).trim();
+				return new Power(Double.parseDouble(value), unit);
+			}
+		}
+		throw new IllegalArgumentException("Could not parse power: " + value);
+	}
+}

diylc-core/src/org/diylc/core/measures/PowerUnit.java

@@ -0,0 +1,24 @@
+package org.diylc.core.measures;
+
+public enum PowerUnit implements Unit {
+
+	MW(1e-1, "mW"), W(1, "W"), KW(1e3, "KW");
+
+	double factor;
+	String display;
+
+	private PowerUnit(double factor, String display) {
+		this.factor = factor;
+		this.display = display;
+	}
+
+	@Override
+	public double getFactor() {
+		return factor;
+	}
+
+	@Override
+	public String toString() {
+		return display;
+	}
+}

diylc-core/src/org/diylc/core/measures/Resistance.java

@@ -69,7 +69,7 @@ public class Resistance extends AbstractMeasure<ResistanceUnit> {
 	public static Resistance parseResistance(String value) {
 		for (ResistanceUnit unit : ResistanceUnit.values()) {
 			if (value.toLowerCase().endsWith(unit.toString().toLowerCase())) {
-				value = value.substring(0, value.length() - unit.toString().length() - 1).trim();
+				value = value.substring(0, value.length() - unit.toString().length()).trim();
 				return new Resistance(Double.parseDouble(value), unit);
 			}
 		}

diylc-core/src/org/diylc/core/measures/ResistanceUnit.java

@@ -2,7 +2,7 @@ package org.diylc.core.measures;
 
 public enum ResistanceUnit implements Unit {
 
-	R(1, "\u03a9"), K(1e3, "K"), M(1e6, "M");
+	R(1, "R"), K(1e3, "K"), M(1e6, "M");
 
 	double factor;
 	String display;

diylc-core/src/org/diylc/core/measures/Voltage.java

@@ -0,0 +1,31 @@
+package org.diylc.core.measures;
+
+public class Voltage extends AbstractMeasure<VoltageUnit> {
+
+	private static final long serialVersionUID = 1L;
+
+	public Voltage() {
+		super();
+		// TODO Auto-generated constructor stub
+	}
+
+	public Voltage(Double value, VoltageUnit unit) {
+		super(value, unit);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public Voltage clone() throws CloneNotSupportedException {
+		return new Voltage(value, unit);
+	}
+
+	public static Voltage parseCapacitance(String value) {
+		for (VoltageUnit unit : VoltageUnit.values()) {
+			if (value.toLowerCase().endsWith(unit.toString().toLowerCase())) {
+				value = value.substring(0, value.length() - unit.toString().length() - 1).trim();
+				return new Voltage(Double.parseDouble(value), unit);
+			}
+		}
+		throw new IllegalArgumentException("Could not parse voltage: " + value);
+	}
+}

diylc-core/src/org/diylc/core/measures/VoltageUnit.java

@@ -0,0 +1,24 @@
+package org.diylc.core.measures;
+
+public enum VoltageUnit implements Unit {
+
+	MV(1e-1, "mV"), V(1, "V"), KV(1e3, "KV");
+
+	double factor;
+	String display;
+
+	private VoltageUnit(double factor, String display) {
+		this.factor = factor;
+		this.display = display;
+	}
+
+	@Override
+	public double getFactor() {
+		return factor;
+	}
+
+	@Override
+	public String toString() {
+		return display;
+	}
+}

diylc-core/src/org/diylc/images/IconLoader.java

@@ -31,7 +31,7 @@ public enum IconLoader {
 			"donate.png"), Bug("bug.png"), IconLarge("icon_large.png"), IconMedium(
 			"icon_medium.png"), IconSmall("icon_small.png"), DocumentEdit("document_edit.png"), EditComponent(
 			"edit_component.png"), Size("size.png"), Front("front.png"), Back("back.png"), Pens(
-			"pens.png"), Sort("sort.png");
+			"pens.png"), Sort("sort.png"), ElementsSelection("elements_selection.png");
 
 	protected String name;