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=4d290426626fbddc50998bf91218028ac124a53a;hb=0b352440b31916f5f0c20390f7fe03b4a808e9c0;hp=d1eac5e6e1ae165168ea461e7b393c4a6479a45d;hpb=697610b0b596503a3e477811b3d2b3761db35e95;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..4d290426 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
@@ -12,6 +12,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 +27,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];
 	}
 
@@ -53,8 +60,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;
-		for (int i = 0; i < logicWidth; i++, inputHeight += 10)
+		double inputHeight = posY + (logicWidth - 1) * heightPerPin;
+		for (int i = 0; i < logicWidth; i++, inputHeight -= 10)
 		{
 			c = BitVectorFormatter.formatAsColor(inputEnds[i]);
 			if (c != null)
@@ -82,6 +89,11 @@ public class GUIMerger extends GUIComponent
 		this.outputEnd = outputEnd;
 	}
 
+	public Pin getOutputPin()
+	{
+		return outputPin;
+	}
+
 	static
 	{
 		ViewLogicModelAdapter.addComponentAdapter(new MergerAdapter());