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=b82d5265de8e1638d5bb4e2c7672e8ebbae7058d;hpb=8c26f70ef8444eae412b35805de3fd43fe3ef345;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 b82d5265..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 @@ -7,13 +7,15 @@ 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.IdentifyParams; import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; import net.mograsim.preferences.Preferences; @@ -23,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) { @@ -36,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 @@ -62,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); @@ -76,7 +80,7 @@ public class GUIBitDisplay extends GUIComponent return bitDisplay != null; } - public BitDisplay getBitDisplay() + public CoreBitDisplay getBitDisplay() { return bitDisplay; } @@ -86,6 +90,18 @@ public class GUIBitDisplay extends GUIComponent return inputPin; } + @Override + public String getIDForSerializing(IdentifyParams idParams) + { + return "GUIBitDisplay"; + } + + @Override + public Integer getParamsForSerializing(IdentifyParams idParams) + { + return logicWidth; + } + static { ViewLogicModelAdapter.addComponentAdapter(new BitDisplayAdapter());