diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/BridgeRectifier.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/BridgeRectifier.java index 5313dfb5..df67c476 100644 --- a/diylc/diylc-library/src/org/diylc/components/semiconductors/BridgeRectifier.java +++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/BridgeRectifier.java @@ -353,7 +353,8 @@ public class BridgeRectifier extends AbstractTransparentComponent { PinShape pinShape = rectifierType.getPinShape(); int pinSize = (int) (pinShape == PinShape.Round ? ROUND_PIN_SIZE.convertToPixels() : SQUARE_PIN_SIZE.convertToPixels()) / 2 * 2; - + + g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1f)); if (!outlineMode) { for (Point point : controlPoints) { g2d.setColor(PIN_COLOR); diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/DIL_IC.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/DIL_IC.java index e619437d..133cf2da 100644 --- a/diylc/diylc-library/src/org/diylc/components/semiconductors/DIL_IC.java +++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/DIL_IC.java @@ -309,13 +309,14 @@ public class DIL_IC extends AbstractTransparentComponent { if (checkPointsClipped(g2d.getClip())) { return; } - Area mainArea = getBody()[0]; + Area mainArea = getBody()[0]; + g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1f)); if (!outlineMode) { int pinSize = (int) PIN_SIZE.convertToPixels() / 2 * 2; for (Point point : controlPoints) { g2d.setColor(PIN_COLOR); g2d.fillRect(point.x - pinSize / 2, point.y - pinSize / 2, pinSize, pinSize); - g2d.setColor(PIN_BORDER_COLOR); + g2d.setColor(PIN_BORDER_COLOR); g2d.drawRect(point.x - pinSize / 2, point.y - pinSize / 2, pinSize, pinSize); } } diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/SIL_IC.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/SIL_IC.java index c70c71ac..e396e7ab 100644 --- a/diylc/diylc-library/src/org/diylc/components/semiconductors/SIL_IC.java +++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/SIL_IC.java @@ -284,12 +284,13 @@ public class SIL_IC extends AbstractTransparentComponent { } Area mainArea = getBody()[0]; + g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1f)); if (!outlineMode) { int pinSize = (int) PIN_SIZE.convertToPixels() / 2 * 2; for (Point point : controlPoints) { g2d.setColor(PIN_COLOR); g2d.fillOval(point.x - pinSize / 2, point.y - pinSize / 2, pinSize, pinSize); - g2d.setColor(PIN_BORDER_COLOR); + g2d.setColor(PIN_BORDER_COLOR); g2d.drawOval(point.x - pinSize / 2, point.y - pinSize / 2, pinSize, pinSize); } } diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO1.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO1.java index cd603479..6adcb452 100644 --- a/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO1.java +++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO1.java @@ -218,12 +218,13 @@ public class TransistorTO1 extends AbstractTransparentComponent { int pinSize = (int) PIN_SIZE.convertToPixels() / 2 * 2; Theme theme = (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME); + g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1f)); for (Point point : controlPoints) { if (!outlineMode) { g2d.setColor(PIN_COLOR); g2d.fillOval(point.x - pinSize / 2, point.y - pinSize / 2, pinSize, pinSize); } - g2d.setColor(outlineMode ? theme.getOutlineColor() : PIN_BORDER_COLOR); + g2d.setColor(outlineMode ? theme.getOutlineColor() : PIN_BORDER_COLOR); g2d.drawOval(point.x - pinSize / 2, point.y - pinSize / 2, pinSize, pinSize); } diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO3.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO3.java index 6865ab55..9f7808f3 100644 --- a/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO3.java +++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO3.java @@ -252,13 +252,14 @@ public class TransistorTO3 extends AbstractTransparentComponent { } int pinSize = (int) PIN_DIAMETER.convertToPixels() / 2 * 2; Theme theme = (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME); + g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1f)); for (Point point : controlPoints) { if (!outlineMode) { g2d.setColor(PIN_COLOR); g2d.fillOval(point.x - pinSize / 2, point.y - pinSize / 2, pinSize, pinSize); } - g2d.setColor(outlineMode ? theme.getOutlineColor() : PIN_BORDER_COLOR); + g2d.setColor(outlineMode ? theme.getOutlineColor() : PIN_BORDER_COLOR); g2d.drawOval(point.x - pinSize / 2, point.y - pinSize / 2, pinSize, pinSize); } diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO92.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO92.java index db8cd4ac..db5531c3 100644 --- a/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO92.java +++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO92.java @@ -250,12 +250,13 @@ public class TransistorTO92 extends AbstractTransparentComponent { return; } int pinSize = (int) PIN_SIZE.convertToPixels() / 2 * 2; + g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1f)); if (!outlineMode) { for (Point point : controlPoints) { g2d.setColor(PIN_COLOR); g2d.fillOval(point.x - pinSize / 2, point.y - pinSize / 2, pinSize, pinSize); - g2d.setColor(PIN_BORDER_COLOR); + g2d.setColor(PIN_BORDER_COLOR); g2d.drawOval(point.x - pinSize / 2, point.y - pinSize / 2, pinSize, pinSize); } } diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar index afecae4e..6cf2e424 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 2d207496..474ba35d 100644 --- a/diylc/diylc-swing/update.xml +++ b/diylc/diylc-swing/update.xml @@ -2401,7 +2401,11 @@ IMPROVEMENT Automatically select dropped components from the component tree after they get placed - + + + IMPROVEMENT + Better rendering of IC and transistor pins when zoomed in + BUG_FIX Drag&Drop from the tree sometimes picks up a wrong component type