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=3f5c2542a44b3c42dc4d321ae55ced75c5079c1e;hb=2f36a21b44c0559fb125765d4b376aba4af6d5b9;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..3f5c2542 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,18 +12,20 @@ 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;
 
 public class GUIMerger extends GUIComponent
 {
-	private static final double width = 20;
+	private static final double width = 10;
 	private static final double heightPerPin = 10;
 
 	public final int logicWidth;
 
-	private ReadEnd[] inputEnds;
+	private final ReadEnd[] inputEnds;
 	private ReadEnd outputEnd;
 
 	public GUIMerger(ViewModelModifiable model, int logicWidth, String name)
@@ -32,6 +37,7 @@ public class GUIMerger extends GUIComponent
 		for (int i = 0; i < logicWidth; i++, inputHeight += 10)
 			addPin(new Pin(this, "I" + i, 1, 0, inputHeight));
 		addPin(new Pin(this, "O", logicWidth, width, logicWidth * heightPerPin / 2));
+		inputEnds = new ReadEnd[logicWidth];
 	}
 
 	@Override
@@ -56,14 +62,22 @@ 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;
+		System.arraycopy(inputEnds, 0, this.inputEnds, 0, logicWidth);
 		this.outputEnd = outputEnd;
 	}
 
 	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