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=2b07238f58f36f8cb5c66dfc57f0290df73cd265;hb=19b9fa6c1cfcd7036c5b0c44c892f029cd04879b;hp=32f04aeee65406aadfaa4361ef86a385b5d19afb;hpb=bfe549387cd5ec28ae38e0420d74c2bc404edbc1;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 32f04aee..2b07238f 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
@@ -1,5 +1,7 @@
 package net.mograsim.logic.ui.model.wires;
 
+import java.util.Map;
+
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 import net.mograsim.logic.core.LogicObservable;
@@ -7,8 +9,10 @@ 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.ModelVisitor;
 import net.mograsim.logic.ui.model.ViewModelModifiable;
 import net.mograsim.logic.ui.model.components.GUIComponent;
+import net.mograsim.logic.ui.model.components.SimpleRectangularGUIGate;
 
 public class WireCrossPoint extends GUIComponent
 {
@@ -28,7 +32,7 @@ public class WireCrossPoint extends GUIComponent
 
 		this.logicWidth = logicWidth;
 		setSize(CIRCLE_DIAM, CIRCLE_DIAM);
-		addPin(this.pin = new Pin(this, logicWidth, CIRCLE_RADIUS, CIRCLE_RADIUS));
+		addPin(this.pin = new Pin(this, "", logicWidth, CIRCLE_RADIUS, CIRCLE_RADIUS));
 	}
 
 	public void moveCenterTo(double x, double y)
@@ -39,9 +43,8 @@ public class WireCrossPoint extends GUIComponent
 	@Override
 	public void render(GeneralGC gc, Rectangle visibleRegion)
 	{
-		Rectangle bounds = getBounds();
 		ColorHelper.executeWithDifferentBackground(gc, BitVectorFormatter.formatAsColor(end),
-				() -> gc.fillOval(bounds.x, bounds.y, CIRCLE_DIAM, CIRCLE_DIAM));
+				() -> gc.fillOval(getPosX(), getPosY(), CIRCLE_DIAM, CIRCLE_DIAM));
 	}
 
 	public void setLogicModelBinding(ReadEnd end)
@@ -72,4 +75,18 @@ public class WireCrossPoint extends GUIComponent
 	{
 		return pin;
 	}
+
+	@Override
+	public Map<String, Object> getInstantiationParameters()
+	{
+		Map<String, Object> m = super.getInstantiationParameters();
+		m.put(SimpleRectangularGUIGate.kLogicWidth, logicWidth);
+		return m;
+	}
+
+	@Override
+	public void accept(ModelVisitor mv)
+	{
+		mv.visit(this);
+	}
 }
\ No newline at end of file