4.27 release

diylc/diylc-core/src/org/diylc/presenter/update.xml

@@ -3917,5 +3917,25 @@
 			</changes>
 			<url>https://github.com/bancika/diy-layout-creator/releases</url>
 		</org.diylc.appframework.update.Version>
+		<org.diylc.appframework.update.Version>
+			<versionNumber>
+				<major>4</major>
+				<minor>27</minor>
+				<build>0</build>
+			</versionNumber>
+			<releaseDate>2022-08-28 00:00:00.000 CET</releaseDate>
+			<name></name>
+			<changes>	
+				<org.diylc.appframework.update.Change>
+					<changeType>NEW_FEATURE</changeType>
+					<description>Added 'Current Source' symbol. Thank you, JD!</description>
+				</org.diylc.appframework.update.Change>			
+				<org.diylc.appframework.update.Change>
+					<changeType>IMPROVEMENT</changeType>
+					<description>Few minor improvements</description>
+				</org.diylc.appframework.update.Change>			
+			</changes>
+			<url>https://github.com/bancika/diy-layout-creator/releases</url>
+		</org.diylc.appframework.update.Version>
 	</a>
 </java.util.Arrays_-ArrayList>

diylc/diylc-library/src/org/diylc/components/electromechanical/ToggleSwitchType.java

@@ -23,18 +23,19 @@ package org.diylc.components.electromechanical;
 
 public enum ToggleSwitchType {
 
-  SPST, SPDT, DPDT, _DP3T_mustang, _3PDT, _4PDT, _5PDT, SPDT_off, DPDT_off, _3PDT_off, _4PDT_off, _5PDT_off, DPDT_ononon_1, DPDT_ononon_2;
+  SPST("SPST"), SPDT("SPDT (On/On)"), SPDT_off("SPDT (On/Off/On"), DPDT("DPDT (On/On)"),DPDT_off("DPDT (On/Off/On"), 
+  DPDT_ononon_1("DPDT (On/On/On Type 1)"), DPDT_ononon_2("DPDT (On/On/On Type 2)"),
+  _DP3T_mustang("DP3T"), _3PDT("3PDT"),_3PDT_off("3PDT (On/Off/On)"), _4PDT("4PDT"), _4PDT_off("4PDT (On/Off/On)"), 
+  _5PDT("5PDT"), _5PDT_off("5PDT (On/Off/On)");
+  
+  private String label;
+  
+  private ToggleSwitchType(String label) {
+    this.label = label;
+  }
 
   @Override
   public String toString() {
-    String name = name();
-    if (name.startsWith("_"))
-      name = name.substring(1);
-    name = name.replace("_", " ");
-    name = name.replace("mustang", "");
-    name = name.replace("off", " (Center OFF)");
-    name = name.replace("ononon_1", " On/On/On (Type 1)");
-    name = name.replace("ononon_2", " On/On/On (Type 2)");
-    return name;
+    return label;
   }
 }

diylc/diylc-library/src/org/diylc/components/misc/CurrentSourceSymbol.java

@@ -23,10 +23,9 @@ package org.diylc.components.misc;
 
 import java.awt.Graphics2D;
 import java.awt.Shape;
-import java.awt.geom.GeneralPath;
 import java.awt.geom.Ellipse2D;
+import java.awt.geom.GeneralPath;
 import java.awt.geom.Line2D;
-
 import org.diylc.components.AbstractSchematicLeadedSymbol;
 import org.diylc.core.CreationMethod;
 import org.diylc.core.IDIYComponent;
@@ -35,7 +34,6 @@ import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.measures.CurrentUnit;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
-import org.diylc.core.measures.VoltageUnit;
 
 @ComponentDescriptor(name = "Current Source", author = "JD", category = "Schematic Symbols", creationMethod = CreationMethod.POINT_BY_POINT, 
                      instanceNamePrefix = "I", description = "Current Source schematic symbol", zOrder = IDIYComponent.COMPONENT)
@@ -81,7 +79,7 @@ public class CurrentSourceSymbol extends AbstractSchematicLeadedSymbol<String> {
     return currentNew;
   }
 
-  public void setVoltageNew(org.diylc.core.measures.Current currentNew) {
+  public void setCurrentNew(org.diylc.core.measures.Current currentNew) {
     this.currentNew = currentNew;
   }
 

diylc/diylc-library/src/org/diylc/components/misc/VoltageSourceSymbol.java

@@ -25,7 +25,6 @@ import java.awt.Graphics2D;
 import java.awt.Shape;
 import java.awt.geom.CubicCurve2D;
 import java.awt.geom.Ellipse2D;
-import java.awt.geom.GeneralPath;
 import java.awt.geom.Line2D;
 import org.diylc.components.AbstractSchematicLeadedSymbol;
 import org.diylc.core.CreationMethod;
@@ -119,9 +118,7 @@ public class VoltageSourceSymbol extends AbstractSchematicLeadedSymbol<String> {
     // Main body is a circle, drawn with an Ellipse
     double width = getWidth().convertToPixels();
     double length = getLength().convertToPixels();
-    GeneralPath body = new GeneralPath();
-    body.append(new Ellipse2D.Double(0d, 0d, width, length), true);
-    return (Shape) body;
+    return new Ellipse2D.Double(0d, 0d, width, length);
   }
 
   @Override

diylc/diylc-swing/build.xml

@@ -10,7 +10,7 @@
 	<property name="jar.dir" value="${build.dir}/jar" />
 	<property name="report.dir" value="${build.dir}/junitreport" />
 	<property name="main.class" value="org.diylc.DIYLCStarter" />
-	<property name="diylc.version" value="4.26.0" />
+	<property name="diylc.version" value="4.27.0" />
 	
 	<property name="osx.jre8.path" value="jre\osx\jre8u321\Contents\Home\" />
 

diylc/diylc-swing/dict.txt

@@ -14,17 +14,18 @@
 #36 (0.13mm / 0.00500in)
 #8 (3.26mm / 0.12849in)
 3PDT
-3PDT  (Center OFF)
+3PDT (On/Off/On)
 4 band
 4P5T (Super/Mega)
 4PDT
-4PDT  (Center OFF)
+4PDT (On/Off/On)
 5 band
 5PDT
-5PDT  (Center OFF)
+5PDT (On/Off/On)
 A-O-I     REGULATOR
 AC
 AWG
+Alternate
 And
 B-C-E     BJT
 C-B-E     BJT
@@ -37,10 +38,12 @@ DFM A
 DFM B
 DIP
 DP3T
-DP3T 
 DP5T
 DPDT
-DPDT  (Center OFF)
+DPDT (On/Off/On
+DPDT (On/On)
+DPDT (On/On/On Type 1)
+DPDT (On/On/On Type 2)
 Deutsch
 Dimension Mode
 Dots (Gradual)
@@ -81,9 +84,11 @@ S-G-D     JFET
 S-G-D     MOSFET
 SMD
 SPDT
-SPDT  (Center OFF)
+SPDT (On/Off/On
+SPDT (On/On)
 SPST
-SourceType
+Source Style
+Source Type
 Srpski
 Xnor
 Xor

diylc/diylc-swing/izpack.xml

@@ -5,7 +5,7 @@
 
 	<info>
 		<appname>DIY Layout Creator</appname>
-		<appversion>4.26.0</appversion>
+		<appversion>4.27.0</appversion>
 		<appsubpath>DIYLC</appsubpath>
 		<javaversion>1.8</javaversion>
 		<authors>