patrick/KinderElektro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PartNode now overwrites draw using 'inside' coordinates instead of 'position'

Browse Source
This commit is contained in:
Patrick Haßel 2024-12-05 15:19:59 +01:00
parent b1a230f176
commit ceb9800f38
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/de/ph87/electro/circuit/node/Node.java
View File

@ -6,7 +6,6 @@ import lombok.NonNull;
import lombok.ToString; import lombok.ToString;
import java.awt.*; import java.awt.*;
import java.awt.geom.AffineTransform;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; 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); 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) { public void draw(@NonNull final Graphics2D g) {
g.setColor(color); g.setColor(color);
g.fillArc(position.x - NODE_RADIUS, position.y - NODE_RADIUS, 2 * NODE_RADIUS, 2 * NODE_RADIUS, 0, 360); g.fillArc(position.x - NODE_RADIUS, position.y - NODE_RADIUS, 2 * NODE_RADIUS, 2 * NODE_RADIUS, 0, 360);
g.setColor(Color.BLACK); g.setColor(Color.BLACK);
g.setStroke(NODE_STROKE); 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); g.drawArc(position.x - NODE_RADIUS, position.y - NODE_RADIUS, 2 * NODE_RADIUS, 2 * NODE_RADIUS, 0, 360);
} }

12
src/main/java/de/ph87/electro/circuit/part/PartNode.java
View File

@ -9,6 +9,9 @@ import lombok.ToString;
import java.awt.*; import java.awt.*;
import java.util.Set; import java.util.Set;
import static de.ph87.electro.CONFIG.NODE_RADIUS;
import static de.ph87.electro.CONFIG.NODE_STROKE;
@Getter @Getter
@ToString(onlyExplicitlyIncluded = true) @ToString(onlyExplicitlyIncluded = true)
public class PartNode extends Node { public class PartNode extends Node {
@ -43,4 +46,13 @@ public class PartNode extends Node {
position = part.transform(inside); 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);
}
} }