X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fwires%2FWireCrossPoint.java;h=5751596949f4b87e0f5ec9fa847dc5aa83b70479;hb=0a0877d1d0fca51260e66d65da3636752ded4242;hp=52db2777da055d81bfbcac0d63bdfd083f458542;hpb=b5d8c2d71e27350ea7c9314e40df5bb0584271cd;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/WireCrossPoint.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/WireCrossPoint.java
index 52db2777..57515969 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/WireCrossPoint.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/WireCrossPoint.java
@@ -10,6 +10,7 @@ import net.mograsim.logic.core.types.BitVectorFormatter;
 import net.mograsim.logic.core.wires.Wire.ReadEnd;
 import net.mograsim.logic.model.model.ViewModelModifiable;
 import net.mograsim.logic.model.model.components.GUIComponent;
+import net.mograsim.logic.model.serializing.IdentifierGetter;
 import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
 import net.mograsim.preferences.ColorDefinition;
 import net.mograsim.preferences.ColorManager;
@@ -28,6 +29,10 @@ public class WireCrossPoint extends GUIComponent
 	private static final int CIRCLE_RADIUS = 1;
 	private static final int CIRCLE_DIAM = CIRCLE_RADIUS * 2;
 
+	/**
+	 * The logical width of this cross point.
+	 */
+	public final int logicWidth;
 	/**
 	 * The (single) pin of this cross point.
 	 */
@@ -52,10 +57,11 @@ public class WireCrossPoint extends GUIComponent
 	public WireCrossPoint(ViewModelModifiable model, int logicWidth, String name)
 	{
 		super(model, name);
-		logicObs = (i) -> requestRedraw();
+		this.logicWidth = logicWidth;
+		logicObs = (i) -> model.requestRedraw();
 
 		setSize(CIRCLE_DIAM, CIRCLE_DIAM);
-		addPin(this.pin = new Pin(this, "", logicWidth, CIRCLE_RADIUS, CIRCLE_RADIUS));
+		addPin(this.pin = new Pin(this, "", logicWidth, PinUsage.TRISTATE, CIRCLE_RADIUS, CIRCLE_RADIUS));
 	}
 
 	// pins
@@ -115,9 +121,9 @@ public class WireCrossPoint extends GUIComponent
 	// serializing
 
 	@Override
-	public JsonElement getParams()
+	public JsonElement getParamsForSerializing(IdentifierGetter idGetter)
 	{
-		return new JsonPrimitive(pin.logicWidth);
+		return new JsonPrimitive(logicWidth);
 	}
 
 	static