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=656c91f2492be739b87d9db56b2cb52cc7fd5673;hpb=bbe38c55aaa999d025f534245f9207a88643f6e5;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 656c91f2..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
@@ -41,9 +41,9 @@ public class GUIMerger extends GUIComponent
 	{
 		super(model, name);
 		this.logicWidth = logicWidth;
-		setSize(width, logicWidth * heightPerPin);
-		double inputHeight = 0;
-		for (int i = 0; i < logicWidth; i++, inputHeight += 10)
+		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];
@@ -60,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)