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=d8ef0152d33aae22ffa4268ba7a6abdb4b5cdaae;hb=8604106a28c3de0b93e46b406a74dc3611e7bca5;hp=4d290426626fbddc50998bf91218028ac124a53a;hpb=0b352440b31916f5f0c20390f7fe03b4a808e9c0;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 4d290426..d8ef0152 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
@@ -2,9 +2,6 @@ package net.mograsim.logic.model.model.components.atomic;
 
 import org.eclipse.swt.SWT;
 
-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;
@@ -60,8 +57,8 @@ public class GUIMerger extends GUIComponent
 			gc.setForeground(ColorManager.current().toColor(c));
 		double outLineY = posY + (logicWidth - 1) * heightPerPin / 2;
 		gc.drawLine(posX + width / 2, outLineY, posX + width, outLineY);
-		double inputHeight = posY + (logicWidth - 1) * heightPerPin;
-		for (int i = 0; i < logicWidth; i++, inputHeight -= 10)
+		double inputHeight = posY;
+		for (int i = 0; i < logicWidth; i++, inputHeight += 10)
 		{
 			c = BitVectorFormatter.formatAsColor(inputEnds[i]);
 			if (c != null)
@@ -78,9 +75,9 @@ public class GUIMerger extends GUIComponent
 	}
 
 	@Override
-	public JsonElement getParamsForSerializing(IdentifierGetter idGetter)
+	public Integer getParamsForSerializing(IdentifierGetter idGetter)
 	{
-		return new JsonPrimitive(logicWidth);
+		return logicWidth;
 	}
 
 	public void setLogicModelBinding(ReadEnd[] inputEnds, ReadEnd outputEnd)