diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar b/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar index d886f9d3..89d989c2 100644 Binary files a/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar and b/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar differ diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/components/AbstractLeadedComponent.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/components/AbstractLeadedComponent.java index f84013cf..3935cd41 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/components/AbstractLeadedComponent.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/components/AbstractLeadedComponent.java @@ -66,8 +66,14 @@ public abstract class AbstractLeadedComponent extends AbstractTransparentComp Shape shape = getBodyShape(); if (shape == null) { g2d.setStroke(new BasicStroke(getLeadThickness().convertToPixels())); - g2d.setColor(getLeadColor(componentState)); + g2d.setColor(shouldShadeLeads() ? getLeadColor(componentState).darker() + : getLeadColor(componentState)); g2d.drawLine(points[0].x, points[0].y, points[1].x, points[1].y); + if (shouldShadeLeads()) { + g2d.setStroke(new BasicStroke(getLeadThickness().convertToPixels() - 2)); + g2d.setColor(getLeadColor(componentState)); + g2d.drawLine(points[0].x, points[0].y, points[1].x, points[1].y); + } return; } Rectangle shapeRect = shape.getBounds(); diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/AxialFilmCapacitor.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/AxialFilmCapacitor.java index 93431dba..60ca94a2 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/AxialFilmCapacitor.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/AxialFilmCapacitor.java @@ -72,7 +72,7 @@ public class AxialFilmCapacitor extends AbstractLeadedComponent { @Override protected Shape getBodyShape() { - return new Rectangle2D.Double(0f, 0f, getWidth().convertToPixels(), getHeight() - .convertToPixels()); + return new Rectangle2D.Double(0f, 0f, getWidth().convertToPixels(), + getClosestOdd(getHeight().convertToPixels())); } } diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialCeramicDiskCapacitor.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialCeramicDiskCapacitor.java index 7257c1f2..2654801b 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialCeramicDiskCapacitor.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialCeramicDiskCapacitor.java @@ -72,7 +72,7 @@ public class RadialCeramicDiskCapacitor extends AbstractLeadedComponent { @Override protected Shape getBodyShape() { double radius = getHeight().convertToPixels() * 0.7; - return new RoundRectangle2D.Double(0f, 0f, getWidth().convertToPixels(), getHeight() - .convertToPixels(), radius, radius); + return new RoundRectangle2D.Double(0f, 0f, getWidth().convertToPixels(), + getClosestOdd(getHeight().convertToPixels()), radius, radius); } } diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Resistor.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Resistor.java index d026ea9c..2b66584c 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Resistor.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Resistor.java @@ -72,7 +72,7 @@ public class Resistor extends AbstractLeadedComponent { @Override protected Shape getBodyShape() { - return new Rectangle2D.Double(0f, 0f, getWidth().convertToPixels(), getHeight() - .convertToPixels()); + return new Rectangle2D.Double(0f, 0f, getWidth().convertToPixels(), + getClosestOdd(getHeight().convertToPixels())); } }