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=d1eac5e6e1ae165168ea461e7b393c4a6479a45d;hpb=e85f81216810b2030cf0b0525a44bc51bb88fbac;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 d1eac5e6..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;
@@ -12,6 +9,7 @@ import net.mograsim.logic.core.wires.Wire.ReadEnd;
 import net.mograsim.logic.model.model.ViewModelModifiable;
 import net.mograsim.logic.model.model.components.GUIComponent;
 import net.mograsim.logic.model.model.wires.Pin;
+import net.mograsim.logic.model.model.wires.PinUsage;
 import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter;
 import net.mograsim.logic.model.modeladapter.componentadapters.MergerAdapter;
 import net.mograsim.logic.model.serializing.IdentifierGetter;
@@ -26,19 +24,25 @@ public class GUIMerger extends GUIComponent
 	private static final double heightPerPin = 10;
 
 	public final int logicWidth;
+	private final Pin outputPin;
 
 	private final ReadEnd[] inputEnds;
 	private ReadEnd outputEnd;
 
+	public GUIMerger(ViewModelModifiable model, int logicWidth)
+	{
+		this(model, logicWidth, null);
+	}
+
 	public GUIMerger(ViewModelModifiable model, int logicWidth, String name)
 	{
 		super(model, name);
 		this.logicWidth = logicWidth;
-		setSize(width, logicWidth * heightPerPin);
-		double inputHeight = 0;
-		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 - 1) * heightPerPin / 2));
+		setSize(width, (logicWidth - 1) * heightPerPin);
+		double inputHeight = (logicWidth - 1) * heightPerPin;
+		for (int i = 0; i < logicWidth; i++, inputHeight -= 10)
+			addPin(new Pin(this, "I" + i, 1, PinUsage.TRISTATE, 0, inputHeight));
+		addPin(this.outputPin = new Pin(this, "O", logicWidth, PinUsage.TRISTATE, width, (logicWidth - 1) * heightPerPin / 2));
 		inputEnds = new ReadEnd[logicWidth];
 	}
 
@@ -71,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)
@@ -82,6 +86,11 @@ public class GUIMerger extends GUIComponent
 		this.outputEnd = outputEnd;
 	}
 
+	public Pin getOutputPin()
+	{
+		return outputPin;
+	}
+
 	static
 	{
 		ViewLogicModelAdapter.addComponentAdapter(new MergerAdapter());