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=026db85f46b6ea58e765ecff069545728eebdcac;hp=fc1743b1676a000b40cc8460e91674fc706864a0;hpb=41c5ae2a1218973a12df311add1bf1366e09797c;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 fc1743b1..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
@@ -1,5 +1,7 @@
 package net.mograsim.logic.model.model.components.atomic;
 
+import org.eclipse.swt.SWT;
+
 import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
 
@@ -20,12 +22,12 @@ import net.mograsim.preferences.Preferences;
 
 public class GUIMerger extends GUIComponent
 {
-	private static final double width = 20;
+	private static final double width = 10;
 	private static final double heightPerPin = 10;
 
 	public final int logicWidth;
 
-	private ReadEnd[] inputEnds;
+	private final ReadEnd[] inputEnds;
 	private ReadEnd outputEnd;
 
 	public GUIMerger(ViewModelModifiable model, int logicWidth, String name)
@@ -36,7 +38,8 @@ public class GUIMerger extends GUIComponent
 		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 * heightPerPin / 2));
+		addPin(new Pin(this, "O", logicWidth, width, (logicWidth - 1) * heightPerPin / 2));
+		inputEnds = new ReadEnd[logicWidth];
 	}
 
 	@Override
@@ -45,20 +48,26 @@ 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);
 		}
 		gc.setForeground(Preferences.current().getColor("net.mograsim.logic.model.color.foreground"));
+		int oldLineCap = gc.getLineCap();
+		int lineJoin = gc.getLineJoin();
+		// TODO find better "replacement" for JOIN_BEVEL
+		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));
-		ColorDefinition c = BitVectorFormatter.formatAsColor(outputEnd);
-		if (c != null)
-			gc.setForeground(ColorManager.current().toColor(c));
-		gc.drawLine(posX + width / 2, posY + heightPerPin * logicWidth / 2, posX + width, posY + heightPerPin * logicWidth / 2);
+		gc.setLineCap(oldLineCap);
 	}
 
 	@Override
@@ -69,7 +78,7 @@ public class GUIMerger extends GUIComponent
 
 	public void setLogicModelBinding(ReadEnd[] inputEnds, ReadEnd outputEnd)
 	{
-		this.inputEnds = inputEnds;
+		System.arraycopy(inputEnds, 0, this.inputEnds, 0, logicWidth);
 		this.outputEnd = outputEnd;
 	}