X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2Fatomic%2FGUIMerger.java;h=fc1743b1676a000b40cc8460e91674fc706864a0;hb=41c5ae2a1218973a12df311add1bf1366e09797c;hp=cee4b74197a59f6aaa347af6da5517c7965d509d;hpb=90535df49bdc91fc81c028fb5b6f966d8fe4a5e3;p=Mograsim.git diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java index cee4b741..fc1743b1 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java @@ -1,5 +1,8 @@ package net.mograsim.logic.model.model.components.atomic; +import com.google.gson.JsonElement; +import com.google.gson.JsonPrimitive; + import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; import net.mograsim.logic.core.types.BitVectorFormatter; @@ -9,6 +12,8 @@ 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.MergerAdapter; +import net.mograsim.logic.model.serializing.IdentifierGetter; +import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; import net.mograsim.preferences.ColorDefinition; import net.mograsim.preferences.ColorManager; import net.mograsim.preferences.Preferences; @@ -56,6 +61,12 @@ public class GUIMerger extends GUIComponent gc.drawLine(posX + width / 2, posY + heightPerPin * logicWidth / 2, posX + width, posY + heightPerPin * logicWidth / 2); } + @Override + public JsonElement getParamsForSerializing(IdentifierGetter idGetter) + { + return new JsonPrimitive(logicWidth); + } + public void setLogicModelBinding(ReadEnd[] inputEnds, ReadEnd outputEnd) { this.inputEnds = inputEnds; @@ -65,5 +76,7 @@ public class GUIMerger extends GUIComponent static { ViewLogicModelAdapter.addComponentAdapter(new MergerAdapter()); + IndirectGUIComponentCreator.setComponentSupplier(GUIMerger.class.getCanonicalName(), + (m, p, n) -> new GUIMerger(m, p.getAsInt(), n)); } } \ No newline at end of file