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=5574d32f9c9c2c99139f4f935293c895ec52831e;hb=61fe4ed550047992a3b67d7120b0a3dc10e13a75;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..5574d32f 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,6 +2,9 @@ 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; @@ -14,6 +17,7 @@ import net.mograsim.logic.model.model.components.GUIComponent; import net.mograsim.logic.model.model.wires.Pin; 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; @@ -28,18 +32,18 @@ public class GUIBitDisplay extends GUIComponent 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(); + logicObs = (i) -> model.requestRedraw(); setSize(width, height); - addPin(this.inputPin = new Pin(this, "", 1, 0, height / 2)); + addPin(this.inputPin = new Pin(this, "", logicWidth, 0, height / 2)); } @Override @@ -86,9 +90,16 @@ public class GUIBitDisplay extends GUIComponent return inputPin; } + @Override + public JsonElement getParamsForSerializing(IdentifierGetter idGetter) + { + return new JsonPrimitive(inputPin.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