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=d1eac5e6e1ae165168ea461e7b393c4a6479a45d;hb=697610b0b596503a3e477811b3d2b3761db35e95;hp=b2a5453928cace68021f6cfebd7e41465972ac3b;hpb=fc5d2fbd1251cd3977976164390803b449e2342f;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 b2a54539..d1eac5e6 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
@@ -48,10 +48,15 @@ public class GUIMerger extends GUIComponent
 		double posX = getPosX();
 		double posY = getPosY();
 
+		ColorDefinition c = BitVectorFormatter.formatAsColor(outputEnd);
+		if (c != null)
+			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)
 		{
-			ColorDefinition c = BitVectorFormatter.formatAsColor(inputEnds[i]);
+			c = BitVectorFormatter.formatAsColor(inputEnds[i]);
 			if (c != null)
 				gc.setForeground(ColorManager.current().toColor(c));
 			gc.drawLine(posX, inputHeight, posX + width / 2, inputHeight);
@@ -63,11 +68,6 @@ public class GUIMerger extends GUIComponent
 		gc.setLineCap(lineJoin == SWT.JOIN_MITER ? SWT.CAP_SQUARE : lineJoin == SWT.JOIN_ROUND ? SWT.CAP_ROUND : SWT.CAP_SQUARE);
 		gc.drawLine(posX + width / 2, posY, posX + width / 2, posY + heightPerPin * (logicWidth - 1));
 		gc.setLineCap(oldLineCap);
-		ColorDefinition c = BitVectorFormatter.formatAsColor(outputEnd);
-		if (c != null)
-			gc.setForeground(ColorManager.current().toColor(c));
-		double outLineY = posY + (logicWidth - 1) * heightPerPin / 2;
-		gc.drawLine(posX + width / 2, outLineY, posX + width, outLineY);
 	}
 
 	@Override