X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2Fatomic%2FModelBitDisplay.java;h=1a01e141bbc82d76c0b3e02c0d65c986e5e8a46f;hb=92862c4723c5eff22257e8de06166a124efb5d77;hp=b0a97b4df25a5b4a92cff6735ba472f3be0ff9d6;hpb=93b398d6271a538a2a4c9f4de07a3b4a8a2a7fd4;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelBitDisplay.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelBitDisplay.java
index b0a97b4d..1a01e141 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelBitDisplay.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelBitDisplay.java
@@ -9,11 +9,11 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 import net.mograsim.logic.core.LogicObserver;
 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.LogicModelModifiable;
 import net.mograsim.logic.model.model.components.ModelComponent;
 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.LogicCoreAdapter;
 import net.mograsim.logic.model.modeladapter.componentadapters.BitDisplayAdapter;
 import net.mograsim.logic.model.serializing.IdentifyParams;
 import net.mograsim.logic.model.serializing.IndirectModelComponentCreator;
@@ -31,19 +31,21 @@ public class ModelBitDisplay extends ModelComponent
 	private final LogicObserver logicObs;
 	private CoreBitDisplay bitDisplay;
 
-	public ModelBitDisplay(ViewModelModifiable model, int logicWidth)
+	public ModelBitDisplay(LogicModelModifiable model, int logicWidth)
 	{
 		this(model, logicWidth, null);
 	}
 
-	public ModelBitDisplay(ViewModelModifiable model, int logicWidth, String name)
+	public ModelBitDisplay(LogicModelModifiable model, int logicWidth, String name)
 	{
-		super(model, name);
+		super(model, name, false);
 		this.logicWidth = logicWidth;
 		logicObs = (i) -> model.requestRedraw();
 
 		setSize(width, height);
-		addPin(this.inputPin = new Pin(this, "", logicWidth, PinUsage.INPUT, 0, height / 2));
+		addPin(this.inputPin = new Pin(model, this, "", logicWidth, PinUsage.INPUT, 0, height / 2));
+
+		init();
 	}
 
 	@Override
@@ -66,7 +68,7 @@ public class ModelBitDisplay extends ModelComponent
 		gc.setFont(oldFont);
 	}
 
-	public void setLogicModelBinding(CoreBitDisplay bitDisplay)
+	public void setCoreModelBinding(CoreBitDisplay bitDisplay)
 	{
 		if (this.bitDisplay != null)
 			this.bitDisplay.deregisterObserver(logicObs);
@@ -75,7 +77,7 @@ public class ModelBitDisplay extends ModelComponent
 			bitDisplay.registerObserver(logicObs);
 	}
 
-	public boolean hasLogicModelBinding()
+	public boolean hasCoreModelBinding()
 	{
 		return bitDisplay != null;
 	}
@@ -104,7 +106,7 @@ public class ModelBitDisplay extends ModelComponent
 
 	static
 	{
-		ViewLogicModelAdapter.addComponentAdapter(new BitDisplayAdapter());
+		LogicCoreAdapter.addComponentAdapter(new BitDisplayAdapter());
 		IndirectModelComponentCreator.setComponentSupplier(ModelBitDisplay.class.getCanonicalName(),
 				(m, p, n) -> new ModelBitDisplay(m, p.getAsInt(), n));
 	}