X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fwires%2FPin.java;h=aec2df0816f33cf81aa01d6838101e9ac65fcb5b;hb=19b9fa6c1cfcd7036c5b0c44c892f029cd04879b;hp=8c0333a4121a934940db8a4d8324956f64e4d9c2;hpb=882f5868691daa071efbf19ff53bab53d6587778;p=Mograsim.git

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/Pin.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/Pin.java
index 8c0333a4..aec2df08 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/Pin.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/Pin.java
@@ -4,14 +4,13 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
 
-import net.mograsim.logic.ui.model.components.GUIComponent;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
-import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
+import net.mograsim.logic.ui.model.components.GUIComponent;
 
-//TODO add an ID and/or a name
 public class Pin
 {
 	public final GUIComponent component;
+	public final String name;
 	public final int logicWidth;
 
 	protected double relX;
@@ -20,9 +19,10 @@ public class Pin
 	private final List<Consumer<? super Pin>> pinMovedListeners;
 	private final List<Runnable> redrawListeners;
 
-	public Pin(GUIComponent component, int logicWidth, double relX, double relY)
+	public Pin(GUIComponent component, String name, int logicWidth, double relX, double relY)
 	{
 		this.component = component;
+		this.name = name;
 		this.logicWidth = logicWidth;
 		this.relX = relX;
 		this.relY = relY;
@@ -50,8 +50,7 @@ public class Pin
 
 	public Point getPos()
 	{
-		Rectangle componentBounds = component.getBounds();
-		return new Point(relX + componentBounds.x, relY + componentBounds.y);
+		return new Point(relX + component.getPosX(), relY + component.getPosY());
 	}
 
 	protected void setRelPos(double relX, double relY)
@@ -73,4 +72,9 @@ public class Pin
 	private void callRedrawListeners  () {redrawListeners  .forEach(l -> l.run   (    ));}
 	// @formatter:on
 
+	@Override
+	public String toString()
+	{
+		return "Pin [" + name + ", point=" + getPos() + "]";
+	}
 }
\ No newline at end of file