diff --git a/diylc/diylc-core/src/org/diylc/components/AbstractLeadedComponent.java b/diylc/diylc-core/src/org/diylc/components/AbstractLeadedComponent.java index 5e97d146..b965b487 100644 --- a/diylc/diylc-core/src/org/diylc/components/AbstractLeadedComponent.java +++ b/diylc/diylc-core/src/org/diylc/components/AbstractLeadedComponent.java @@ -117,7 +117,7 @@ public abstract class AbstractLeadedComponent extends AbstractTransparentComp // g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, // 0.5f)); // } - int leadThickness = getClosestOdd(getLeadThickness()); + float leadThickness = getLeadThickness(); double leadLength = (distance - calculatePinSpacing(shapeRect)) / 2 - leadThickness / 2; g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness)); Color leadColor = @@ -335,8 +335,8 @@ public abstract class AbstractLeadedComponent extends AbstractTransparentComp /** * @return default lead thickness. Override this method to change it. */ - protected int getLeadThickness() { - return (int) LEAD_THICKNESS.convertToPixels(); + protected float getLeadThickness() { + return getClosestOdd(LEAD_THICKNESS.convertToPixels()); } /** diff --git a/diylc/diylc-core/src/org/diylc/components/AbstractSchematicLeadedSymbol.java b/diylc/diylc-core/src/org/diylc/components/AbstractSchematicLeadedSymbol.java index c58de88e..a9cc9745 100644 --- a/diylc/diylc-core/src/org/diylc/components/AbstractSchematicLeadedSymbol.java +++ b/diylc/diylc-core/src/org/diylc/components/AbstractSchematicLeadedSymbol.java @@ -36,7 +36,7 @@ public abstract class AbstractSchematicLeadedSymbol extends AbstractLeadedCom } @Override - protected int getLeadThickness() { + protected float getLeadThickness() { return 1; } diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index ff94d4c5..0a6d124c 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/connectivity/CopperTrace.java b/diylc/diylc-library/src/org/diylc/components/connectivity/CopperTrace.java index 178c7dd7..bb942a37 100644 --- a/diylc/diylc-library/src/org/diylc/components/connectivity/CopperTrace.java +++ b/diylc/diylc-library/src/org/diylc/components/connectivity/CopperTrace.java @@ -84,8 +84,8 @@ public class CopperTrace extends AbstractLeadedComponent { } @Override - protected int getLeadThickness() { - return (int) getThickness().convertToPixels(); + protected float getLeadThickness() { + return (float) getThickness().convertToPixels(); } @Override diff --git a/diylc/diylc-library/src/org/diylc/components/connectivity/CurvedTrace.java b/diylc/diylc-library/src/org/diylc/components/connectivity/CurvedTrace.java index b2f1f8c0..f0e68a59 100644 --- a/diylc/diylc-library/src/org/diylc/components/connectivity/CurvedTrace.java +++ b/diylc/diylc-library/src/org/diylc/components/connectivity/CurvedTrace.java @@ -38,7 +38,7 @@ public class CurvedTrace extends AbstractCurvedComponent { @Override protected void drawCurve(CubicCurve2D curve, Graphics2D g2d, ComponentState componentState) { - int thickness = (int) size.convertToPixels(); + float thickness = (float) size.convertToPixels(); g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(thickness)); Color curveColor = componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index ff94d4c5..0a6d124c 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 4d8d4487..0b8258ce 100644 Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ diff --git a/diylc/diylc-swing/update.xml b/diylc/diylc-swing/update.xml index 84dd2c79..123498ba 100644 --- a/diylc/diylc-swing/update.xml +++ b/diylc/diylc-swing/update.xml @@ -1708,7 +1708,7 @@ IMPROVEMENT - Solder Pad size shouldn't be rounded up or down to the nearest integer to allow better precision + Solder Pad and Copper Trace size shouldn't be rounded up or down to the nearest integer to allow better precision IMPROVEMENT