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=9d6b57e5a35fe01ed7a710f585ce7dc0a47bb6ac;hb=0718235b9673658d6ecf3b0b91894812048aa42f;hp=c837fd44274aabf2e8b7d37e1a225904e055068c;hpb=e8e95e2e345f4d9c5927aa78f5c0fb607d352a97;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 c837fd44..9d6b57e5 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; @@ -23,23 +27,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); + 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, 0, height / 2)); } @Override @@ -86,9 +92,16 @@ public class GUIBitDisplay extends GUIComponent return inputPin; } + @Override + public JsonElement getParamsForSerializing(IdentifierGetter idGetter) + { + return new JsonPrimitive(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