X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fwires%2FWireCrossPoint.java;h=e48d7756d5d21f1d4efc49aa1987133393cf8168;hb=a93901091c018edc992828e3a23817e97a98e4ca;hp=46262808fb76821df537e638b26e90c65e5d2a2c;hpb=e7193d1fb16edc79e9cc3d8adcfb71caecd8463b;p=Mograsim.git

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/WireCrossPoint.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/WireCrossPoint.java
index 46262808..e48d7756 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/WireCrossPoint.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/WireCrossPoint.java
@@ -7,25 +7,33 @@ import net.mograsim.logic.core.LogicObserver;
 import net.mograsim.logic.core.types.BitVectorFormatter;
 import net.mograsim.logic.core.wires.Wire.ReadEnd;
 import net.mograsim.logic.ui.ColorHelper;
-import net.mograsim.logic.ui.model.ViewModel;
+import net.mograsim.logic.ui.model.ViewModelModifiable;
 import net.mograsim.logic.ui.model.components.GUIComponent;
 
 public class WireCrossPoint extends GUIComponent
 {
+	private static final int CIRCLE_RADIUS = 1;
+	private static final int CIRCLE_DIAM = CIRCLE_RADIUS * 2;
+
 	private final Pin pin;
 	private final int logicWidth;
 
 	private final LogicObserver logicObs;
 	private ReadEnd end;
 
-	public WireCrossPoint(ViewModel model, int logicWidth)
+	public WireCrossPoint(ViewModelModifiable model, int logicWidth)
 	{
 		super(model);
 		logicObs = (i) -> requestRedraw();
 
 		this.logicWidth = logicWidth;
-		setSize(0, 0);
-		addPin(this.pin = new Pin(this, logicWidth, 0, 0));
+		setSize(CIRCLE_DIAM, CIRCLE_DIAM);
+		addPin(this.pin = new Pin(this, "", logicWidth, CIRCLE_RADIUS, CIRCLE_RADIUS));
+	}
+
+	public void moveCenterTo(double x, double y)
+	{
+		moveTo(x - CIRCLE_RADIUS, y - CIRCLE_RADIUS);
 	}
 
 	@Override
@@ -33,7 +41,7 @@ public class WireCrossPoint extends GUIComponent
 	{
 		Rectangle bounds = getBounds();
 		ColorHelper.executeWithDifferentBackground(gc, BitVectorFormatter.formatAsColor(end),
-				() -> gc.fillOval(bounds.x - 1, bounds.y - 1, 2, 2));
+				() -> gc.fillOval(bounds.x, bounds.y, CIRCLE_DIAM, CIRCLE_DIAM));
 	}
 
 	public void setLogicModelBinding(ReadEnd end)