add more pin options

Adjustable solder pad hole size
Better lead and label rendering when lead spacing is smaller than component body
2026-11-10 01:02:08 +10:00 · 2012-02-02 04:41:40 +00:00 · 2012-02-02 04:30:25 +00:00 · 2012-02-02 04:29:45 +00:00 · 2012-02-02 04:29:37 +00:00 · 2012-02-02 04:26:59 +00:00
394 changed files with 6321 additions and 266 deletions
@@ -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>
@@ -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>
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>DIYLC</name>
+	<name>diylc-core</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -0,0 +1,76 @@
+<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>
+	</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>
@@ -1,6 +1,6 @@
 package org.diylc.common;

-import com.diyfever.gui.simplemq.IMessageListener;
+import org.diylc.appframework.simplemq.IMessageListener;

 /**
 * Interface for plug-ins.
@@ -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
@@ -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,6 +143,41 @@ public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComp
 			}
 			g2d.setColor(finalBorderColor);
 			g2d.draw(shape);
+			
+			// 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));
+				Color leadColor = shouldShadeLeads() ? getLeadColor(componentState).darker()
+						: getLeadColor(componentState);
+				g2d.setColor(leadColor);
+				int endX = (int) (points[0].x + Math.cos(theta) * leadLength);
+				int endY = (int) Math.round(points[0].y + Math.sin(theta) * leadLength);
+				g2d.drawLine(points[0].x, points[0].y, endX, endY);
+				endX = (int) (points[1].x + Math.cos(theta - Math.PI) * leadLength);
+				endY = (int) Math.round(points[1].y + Math.sin(theta - Math.PI) * leadLength);
+				g2d.drawLine(points[1].x, points[1].y, endX, endY);
+				if (shouldShadeLeads()) {
+					g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness - 2));
+					leadColor = getLeadColor(componentState);
+					g2d.setColor(leadColor);
+					g2d.drawLine(points[0].x, points[0].y, (int) (points[0].x + Math.cos(theta)
+							* leadLength), (int) (points[0].y + Math.sin(theta) * leadLength));
+					g2d.drawLine(points[1].x, points[1].y, (int) (points[1].x + Math.cos(theta
+							- Math.PI)
+							* 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;
@@ -169,34 +203,7 @@ public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComp
 			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) {
-				g2d.setTransform(oldTransform);
-				int leadThickness = getClosestOdd(getLeadThickness());
-				double leadLength = (distance - shapeRect.width) / 2 - leadThickness / 2;
-				g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness));
-				Color leadColor = shouldShadeLeads() ? getLeadColor(componentState).darker()
-						: getLeadColor(componentState);
-				g2d.setColor(leadColor);
-				int endX = (int) (points[0].x + Math.cos(theta) * leadLength);
-				int endY = (int) Math.round(points[0].y + Math.sin(theta) * leadLength);
-				g2d.drawLine(points[0].x, points[0].y, endX, endY);
-				endX = (int) (points[1].x + Math.cos(theta - Math.PI) * leadLength);
-				endY = (int) Math.round(points[1].y + Math.sin(theta - Math.PI) * leadLength);
-				g2d.drawLine(points[1].x, points[1].y, endX, endY);
-				if (shouldShadeLeads()) {
-					g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness - 2));
-					leadColor = getLeadColor(componentState);
-					g2d.setColor(leadColor);
-					g2d.drawLine(points[0].x, points[0].y, (int) (points[0].x + Math.cos(theta)
-							* leadLength), (int) (points[0].y + Math.sin(theta) * leadLength));
-					g2d.drawLine(points[1].x, points[1].y, (int) (points[1].x + Math.cos(theta
-							- Math.PI)
-							* leadLength), (int) (points[1].y + Math.sin(theta - Math.PI)
-							* leadLength));
-				}
-			}
+			g2d.setTransform(oldTransform);
 		}
 	}

@@ -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
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
bancika	e218ca8105		2012-02-02 04:41:40 +00:00
bancika	3d3a6e27d2		2012-02-02 04:30:25 +00:00
bancika	10884452fd		2012-02-02 04:29:45 +00:00
bancika	6d4c2a8141		2012-02-02 04:29:37 +00:00
bancika	66f4d98ff9	add more pin options	2012-02-02 04:26:59 +00:00
bancika	a00028131f	Adjustable solder pad hole size	2011-09-03 20:01:09 +00:00
bancika	7f2b973638	Better lead and label rendering when lead spacing is smaller than component body	2011-09-03 19:47:35 +00:00
bancika	144bfb01ad	Select All should not include locked components	2011-09-03 19:38:15 +00:00
bancika	84d0da6308	Renumber function sometimes doesn't work as expected	2011-09-03 19:19:07 +00:00
bancika	0df3bc37a0	increase PNG resolution to 300dpi	2011-09-03 19:07:19 +00:00
bancika	a0b43def22	move to new project directory names	2011-08-29 22:14:50 +00:00
bancika	602c98ead4	move to new project directory names	2011-08-29 21:41:09 +00:00
bancika	4b64917654	move to new project directory names	2011-08-29 21:16:26 +00:00
bancika	030ba71126		2011-08-29 21:16:09 +00:00
bancika	eb4d08be68	move to new project directory names	2011-08-29 21:10:45 +00:00
bancika	b642dc6cbd	move to new project directory names	2011-08-29 20:57:51 +00:00
bancika	112bfdd3d0	move to new project directory names	2011-08-29 20:54:36 +00:00
bancika	79f83308d8	move to new project directory names	2011-08-29 20:46:53 +00:00