From 66e1227182c452aefcabf81b6753ba8cda307f52 Mon Sep 17 00:00:00 2001 From: Branislav Stojkovic Date: Sat, 9 Feb 2019 10:09:48 +0100 Subject: [PATCH] fix eyelet and turret not setting their own stroke --- .../src/org/diylc/components/connectivity/Eyelet.java | 4 +++- .../src/org/diylc/components/connectivity/Turret.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/diylc/diylc-library/src/org/diylc/components/connectivity/Eyelet.java b/diylc/diylc-library/src/org/diylc/components/connectivity/Eyelet.java index 867138d6..dc2b8186 100644 --- a/diylc/diylc-library/src/org/diylc/components/connectivity/Eyelet.java +++ b/diylc/diylc-library/src/org/diylc/components/connectivity/Eyelet.java @@ -25,6 +25,7 @@ import java.awt.Color; import java.awt.Graphics2D; import java.awt.Point; +import org.diylc.common.ObjectCache; import org.diylc.common.SimpleComponentTransformer; import org.diylc.components.AbstractComponent; import org.diylc.core.ComponentState; @@ -66,7 +67,8 @@ public class Eyelet extends AbstractComponent { return; } int diameter = getClosestOdd((int) size.convertToPixels()); - int holeDiameter = getClosestOdd((int) holeSize.convertToPixels()); + int holeDiameter = getClosestOdd((int) holeSize.convertToPixels()); + g2d.setStroke(ObjectCache.getInstance().fetchZoomableStroke(1f)); g2d.setColor(color); drawingObserver.startTrackingContinuityArea(true); g2d.fillOval(point.x - diameter / 2, point.y - diameter / 2, diameter, diameter); diff --git a/diylc/diylc-library/src/org/diylc/components/connectivity/Turret.java b/diylc/diylc-library/src/org/diylc/components/connectivity/Turret.java index e0416d91..3091ae51 100644 --- a/diylc/diylc-library/src/org/diylc/components/connectivity/Turret.java +++ b/diylc/diylc-library/src/org/diylc/components/connectivity/Turret.java @@ -24,7 +24,8 @@ package org.diylc.components.connectivity; import java.awt.Color; import java.awt.Graphics2D; import java.awt.Point; - + +import org.diylc.common.ObjectCache; import org.diylc.common.SimpleComponentTransformer; import org.diylc.components.AbstractComponent; import org.diylc.core.ComponentState; @@ -67,6 +68,7 @@ public class Turret extends AbstractComponent { int diameter = getClosestOdd((int) size.convertToPixels()); int holeDiameter = getClosestOdd((int) holeSize.convertToPixels()); g2d.setColor(color); + g2d.setStroke(ObjectCache.getInstance().fetchZoomableStroke(1f)); drawingObserver.startTrackingContinuityArea(true); g2d.fillOval(point.x - diameter / 2, point.y - diameter / 2, diameter, diameter); drawingObserver.stopTrackingContinuityArea();