X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2Fatomic%2FGUIBitDisplay.java;h=ac92ecbac0127b99908213e79e0e7b9bf314daf4;hb=0a04a4ed66ecebd4254541c4977599f6052c115a;hp=5574d32f9c9c2c99139f4f935293c895ec52831e;hpb=61fe4ed550047992a3b67d7120b0a3dc10e13a75;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIBitDisplay.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIBitDisplay.java
index 5574d32f..ac92ecba 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIBitDisplay.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIBitDisplay.java
@@ -2,22 +2,20 @@ package net.mograsim.logic.model.model.components.atomic;
 
 import org.eclipse.swt.graphics.Color;
 
-import com.google.gson.JsonElement;
-import com.google.gson.JsonPrimitive;
-
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Font;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 import net.mograsim.logic.core.LogicObserver;
-import net.mograsim.logic.core.components.BitDisplay;
+import net.mograsim.logic.core.components.CoreBitDisplay;
 import net.mograsim.logic.core.types.BitVectorFormatter;
 import net.mograsim.logic.model.model.ViewModelModifiable;
 import net.mograsim.logic.model.model.components.GUIComponent;
 import net.mograsim.logic.model.model.wires.Pin;
+import net.mograsim.logic.model.model.wires.PinUsage;
 import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter;
 import net.mograsim.logic.model.modeladapter.componentadapters.BitDisplayAdapter;
-import net.mograsim.logic.model.serializing.IdentifierGetter;
+import net.mograsim.logic.model.serializing.IdentifyParams;
 import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
 import net.mograsim.preferences.Preferences;
 
@@ -27,10 +25,11 @@ public class GUIBitDisplay extends GUIComponent
 	private static final double height = 15;
 	private static final double fontHeight = 5;
 
+	public final int logicWidth;
 	private final Pin inputPin;
 
 	private final LogicObserver logicObs;
-	private BitDisplay bitDisplay;
+	private CoreBitDisplay bitDisplay;
 
 	public GUIBitDisplay(ViewModelModifiable model, int logicWidth)
 	{
@@ -40,10 +39,11 @@ public class GUIBitDisplay extends GUIComponent
 	public GUIBitDisplay(ViewModelModifiable model, int logicWidth, String name)
 	{
 		super(model, name);
+		this.logicWidth = logicWidth;
 		logicObs = (i) -> model.requestRedraw();
 
 		setSize(width, height);
-		addPin(this.inputPin = new Pin(this, "", logicWidth, 0, height / 2));
+		addPin(this.inputPin = new Pin(this, "", logicWidth, PinUsage.INPUT, 0, height / 2));
 	}
 
 	@Override
@@ -66,7 +66,7 @@ public class GUIBitDisplay extends GUIComponent
 		gc.setFont(oldFont);
 	}
 
-	public void setLogicModelBinding(BitDisplay bitDisplay)
+	public void setLogicModelBinding(CoreBitDisplay bitDisplay)
 	{
 		if (this.bitDisplay != null)
 			this.bitDisplay.deregisterObserver(logicObs);
@@ -80,7 +80,7 @@ public class GUIBitDisplay extends GUIComponent
 		return bitDisplay != null;
 	}
 
-	public BitDisplay getBitDisplay()
+	public CoreBitDisplay getBitDisplay()
 	{
 		return bitDisplay;
 	}
@@ -91,9 +91,15 @@ public class GUIBitDisplay extends GUIComponent
 	}
 
 	@Override
-	public JsonElement getParamsForSerializing(IdentifierGetter idGetter)
+	public String getIDForSerializing(IdentifyParams idParams)
+	{
+		return "GUIBitDisplay";
+	}
+
+	@Override
+	public Integer getParamsForSerializing(IdentifyParams idParams)
 	{
-		return new JsonPrimitive(inputPin.logicWidth);
+		return logicWidth;
 	}
 
 	static