From ceb9800f3851f966db383c1447c0eb27ceb9d89d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= <git@patrick-hassel.de>
Date: Thu, 5 Dec 2024 15:19:59 +0100
Subject: [PATCH] PartNode now overwrites draw using 'inside' coordinates
 instead of 'position'

---
 src/main/java/de/ph87/electro/circuit/node/Node.java |  3 ---
 .../java/de/ph87/electro/circuit/part/PartNode.java  | 12 ++++++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/de/ph87/electro/circuit/node/Node.java b/src/main/java/de/ph87/electro/circuit/node/Node.java
index d34f4cd..9b3ff4f 100644
--- a/src/main/java/de/ph87/electro/circuit/node/Node.java
+++ b/src/main/java/de/ph87/electro/circuit/node/Node.java
@@ -6,7 +6,6 @@ import lombok.NonNull;
 import lombok.ToString;
 
 import java.awt.*;
-import java.awt.geom.AffineTransform;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -63,14 +62,12 @@ public class Node {
     this.color = Double.isNaN(voltage) ? VOLTAGE_UNKNOWN_COLOR : ((voltage >= VOLTAGE_HIGH_MIN) ? VOLTAGE_HIGH_COLOR : VOLTAGE_LOW_COLOR);
   }
 
-  public void draw(final Graphics2D g) {
   public void draw(@NonNull final Graphics2D g) {
     g.setColor(color);
     g.fillArc(position.x - NODE_RADIUS, position.y - NODE_RADIUS, 2 * NODE_RADIUS, 2 * NODE_RADIUS, 0, 360);
 
     g.setColor(Color.BLACK);
     g.setStroke(NODE_STROKE);
-    g.drawArc(inside.x - NODE_RADIUS, inside.y - NODE_RADIUS, 2 * NODE_RADIUS, 2 * NODE_RADIUS, 0, 360);
     g.drawArc(position.x - NODE_RADIUS, position.y - NODE_RADIUS, 2 * NODE_RADIUS, 2 * NODE_RADIUS, 0, 360);
   }
 
diff --git a/src/main/java/de/ph87/electro/circuit/part/PartNode.java b/src/main/java/de/ph87/electro/circuit/part/PartNode.java
index d1beac9..5697b63 100644
--- a/src/main/java/de/ph87/electro/circuit/part/PartNode.java
+++ b/src/main/java/de/ph87/electro/circuit/part/PartNode.java
@@ -9,6 +9,9 @@ import lombok.ToString;
 import java.awt.*;
 import java.util.Set;
 
+import static de.ph87.electro.CONFIG.NODE_RADIUS;
+import static de.ph87.electro.CONFIG.NODE_STROKE;
+
 @Getter
 @ToString(onlyExplicitlyIncluded = true)
 public class PartNode extends Node {
@@ -43,4 +46,13 @@ public class PartNode extends Node {
     position = part.transform(inside);
   }
 
+  public void draw(@NonNull final Graphics2D g) {
+    g.setColor(getColor());
+    g.fillArc(inside.x - NODE_RADIUS, inside.y - NODE_RADIUS, 2 * NODE_RADIUS, 2 * NODE_RADIUS, 0, 360);
+
+    g.setColor(Color.BLACK);
+    g.setStroke(NODE_STROKE);
+    g.drawArc(inside.x - NODE_RADIUS, inside.y - NODE_RADIUS, 2 * NODE_RADIUS, 2 * NODE_RADIUS, 0, 360);
+  }
+
 }