package net.mograsim.logic.model.model.components.atomic;\r
\r
+import com.google.gson.JsonElement;\r
+import com.google.gson.JsonPrimitive;\r
+\r
import net.haspamelodica.swt.helper.gcs.GeneralGC;\r
import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;\r
import net.mograsim.logic.core.types.BitVectorFormatter;\r
import net.mograsim.logic.model.model.wires.Pin;\r
import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter;\r
import net.mograsim.logic.model.modeladapter.componentadapters.MergerAdapter;\r
+import net.mograsim.logic.model.serializing.IdentifierGetter;\r
+import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;\r
import net.mograsim.preferences.ColorDefinition;\r
import net.mograsim.preferences.ColorManager;\r
import net.mograsim.preferences.Preferences;\r
\r
public class GUIMerger extends GUIComponent\r
{\r
- private static final double width = 20;\r
+ private static final double width = 10;\r
private static final double heightPerPin = 10;\r
\r
public final int logicWidth;\r
\r
- private ReadEnd[] inputEnds;\r
+ private final ReadEnd[] inputEnds;\r
private ReadEnd outputEnd;\r
\r
public GUIMerger(ViewModelModifiable model, int logicWidth, String name)\r
for (int i = 0; i < logicWidth; i++, inputHeight += 10)\r
addPin(new Pin(this, "I" + i, 1, 0, inputHeight));\r
addPin(new Pin(this, "O", logicWidth, width, logicWidth * heightPerPin / 2));\r
+ inputEnds = new ReadEnd[logicWidth];\r
}\r
\r
@Override\r
gc.drawLine(posX + width / 2, posY + heightPerPin * logicWidth / 2, posX + width, posY + heightPerPin * logicWidth / 2);\r
}\r
\r
+ @Override\r
+ public JsonElement getParamsForSerializing(IdentifierGetter idGetter)\r
+ {\r
+ return new JsonPrimitive(logicWidth);\r
+ }\r
+\r
public void setLogicModelBinding(ReadEnd[] inputEnds, ReadEnd outputEnd)\r
{\r
- this.inputEnds = inputEnds;\r
+ System.arraycopy(inputEnds, 0, this.inputEnds, 0, logicWidth);\r
this.outputEnd = outputEnd;\r
}\r
\r
static\r
{\r
ViewLogicModelAdapter.addComponentAdapter(new MergerAdapter());\r
+ IndirectGUIComponentCreator.setComponentSupplier(GUIMerger.class.getCanonicalName(),\r
+ (m, p, n) -> new GUIMerger(m, p.getAsInt(), n));\r
}\r
}
\ No newline at end of file