diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml
index 6f212762..0ac6265b 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/update.xml
+++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml
@@ -2931,7 +2931,7 @@
4
0
- 2020-04-09 00:00:00.000 CET
+ 2020-04-16 00:00:00.000 CET
diff --git a/diylc/diylc-core/test/org/diylc/presenter/ClassProcessorTest.java b/diylc/diylc-core/test/org/diylc/presenter/ClassProcessorTest.java
index 7926e2b2..d1401f1a 100644
--- a/diylc/diylc-core/test/org/diylc/presenter/ClassProcessorTest.java
+++ b/diylc/diylc-core/test/org/diylc/presenter/ClassProcessorTest.java
@@ -37,6 +37,6 @@ public class ClassProcessorTest {
public void testExtractProperties() {
List properties = ComponentProcessor.getInstance().extractProperties(MockDIYComponent.class);
assertNotNull(properties);
- assertEquals(4, properties.size());
+ assertEquals(5, properties.size());
};
}
diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar
index 90d6d681..eeba5aa2 100644
Binary files a/diylc/diylc-library/lib/diylc-core.jar and b/diylc/diylc-library/lib/diylc-core.jar differ
diff --git a/diylc/diylc-library/src/org/diylc/components/AbstractRadialComponent.java b/diylc/diylc-library/src/org/diylc/components/AbstractRadialComponent.java
index 81c575d6..26a10701 100644
--- a/diylc/diylc-library/src/org/diylc/components/AbstractRadialComponent.java
+++ b/diylc/diylc-library/src/org/diylc/components/AbstractRadialComponent.java
@@ -28,7 +28,7 @@ import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit;
/**
- * Base class for radial components. The same as {@link AbstractRadialComponent} but with added pin
+ * Base class for radial components. The same as {@link AbstractLeadedComponent} but with added pin
* spacing.
*
* @author bancika
@@ -48,7 +48,7 @@ public abstract class AbstractRadialComponent extends AbstractLeadedComponent
return (int) getPinSpacing().convertToPixels();
}
- @EditableProperty(name = "Pin spacing")
+ @EditableProperty(name = "Pin Spacing")
public Size getPinSpacing() {
if (pinSpacing == null) {
pinSpacing = PIN_SPACING;
@@ -59,5 +59,4 @@ public abstract class AbstractRadialComponent extends AbstractLeadedComponent
public void setPinSpacing(Size pinSpacing) {
this.pinSpacing = pinSpacing;
}
-
}
diff --git a/diylc/diylc-library/src/org/diylc/components/passive/RadialFilmCapacitor.java b/diylc/diylc-library/src/org/diylc/components/passive/RadialFilmCapacitor.java
index 0fb84d15..b1494569 100644
--- a/diylc/diylc-library/src/org/diylc/components/passive/RadialFilmCapacitor.java
+++ b/diylc/diylc-library/src/org/diylc/components/passive/RadialFilmCapacitor.java
@@ -23,6 +23,7 @@ package org.diylc.components.passive;
import java.awt.Color;
import java.awt.Graphics2D;
+import java.awt.Rectangle;
import java.awt.Shape;
import java.awt.geom.RoundRectangle2D;
@@ -30,6 +31,9 @@ import org.diylc.common.SimpleComponentTransformer;
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.Size;
+import org.diylc.core.measures.SizeUnit;
@ComponentDescriptor(name = "Film Capacitor (Radial)", author = "Branislav Stojkovic", category = "Passive",
creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "C",
@@ -40,7 +44,11 @@ public class RadialFilmCapacitor extends AbstractFilmCapacitor {
private static final long serialVersionUID = 1L;
public static Color BODY_COLOR = Color.decode("#FF8000");
- public static Color BORDER_COLOR = BODY_COLOR.darker();
+ public static Color BORDER_COLOR = BODY_COLOR.darker();
+
+ public static Size PIN_SPACING = new Size(0.1d, SizeUnit.in);
+
+ private Size pinSpacing = PIN_SPACING;
public RadialFilmCapacitor() {
super();
@@ -63,5 +71,22 @@ public class RadialFilmCapacitor extends AbstractFilmCapacitor {
double radius = getWidth().convertToPixels() * 0.7;
return new RoundRectangle2D.Double(0f, 0f, getLength().convertToPixels(), getClosestOdd(getWidth()
.convertToPixels()), radius, radius);
+ }
+
+ @Override
+ protected int calculatePinSpacing(Rectangle shapeRect) {
+ return (int) getPinSpacing().convertToPixels();
+ }
+
+ @EditableProperty(name = "Pin Spacing")
+ public Size getPinSpacing() {
+ if (pinSpacing == null) {
+ pinSpacing = PIN_SPACING;
+ }
+ return pinSpacing;
+ }
+
+ public void setPinSpacing(Size pinSpacing) {
+ this.pinSpacing = pinSpacing;
}
}
diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar
index 90d6d681..eeba5aa2 100644
Binary files a/diylc/diylc-swing/lib/diylc-core.jar and b/diylc/diylc-swing/lib/diylc-core.jar differ
diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar
index 49f885db..f466f760 100644
Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ