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=01153098107dba1a4e37a746fb187c8d29ed3424;hb=c202aac61021b9d12e4ac6495001bcd012cecde0;hp=2c541f8bd75788e5551f18ce92d94a7e860887da;hpb=db4075ec14984a406b863c153c873c17adc23dab;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 2c541f8b..01153098 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 @@ -12,8 +12,10 @@ 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.IndirectGUIComponentCreator; import net.mograsim.preferences.Preferences; @@ -23,23 +25,25 @@ 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; - public GUIBitDisplay(ViewModelModifiable model) + public GUIBitDisplay(ViewModelModifiable model, int logicWidth) { - this(model, null); + this(model, logicWidth, null); } - public GUIBitDisplay(ViewModelModifiable model, String name) + public GUIBitDisplay(ViewModelModifiable model, int logicWidth, String name) { super(model, name); - logicObs = (i) -> requestRedraw(); + this.logicWidth = logicWidth; + logicObs = (i) -> model.requestRedraw(); setSize(width, height); - addPin(this.inputPin = new Pin(this, "", 1, 0, height / 2)); + addPin(this.inputPin = new Pin(this, "", logicWidth, PinUsage.INPUT, 0, height / 2)); } @Override @@ -86,9 +90,16 @@ public class GUIBitDisplay extends GUIComponent return inputPin; } + @Override + public Integer getParamsForSerializing(IdentifierGetter idGetter) + { + return logicWidth; + } + static { ViewLogicModelAdapter.addComponentAdapter(new BitDisplayAdapter()); - IndirectGUIComponentCreator.setComponentSupplier(GUIBitDisplay.class.getCanonicalName(), (m, p, n) -> new GUIBitDisplay(m, n)); + IndirectGUIComponentCreator.setComponentSupplier(GUIBitDisplay.class.getCanonicalName(), + (m, p, n) -> new GUIBitDisplay(m, p.getAsInt(), n)); } } \ No newline at end of file