Fixed GUIMerger / GUISplitter bit order

[Mograsim.git] / net.mograsim.logic.model / src / net / mograsim / logic / model / model / components / atomic / GUISplitter.java

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java
index ca3c9e4..6ddc276 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.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;
 
@@ -33,7 +35,7 @@ public class GUISplitter extends GUIComponent
                super(model, name);
                this.logicWidth = logicWidth;
                setSize(width, logicWidth * heightPerPin);
-               addPin(new Pin(this, "I", logicWidth, 0, logicWidth * heightPerPin / 2));
+               addPin(new Pin(this, "I", logicWidth, 0, (logicWidth - 1) * heightPerPin / 2));
                double outputHeight = 0;
                for (int i = 0; i < logicWidth; i++, outputHeight += 10)
                        addPin(new Pin(this, "O" + i, 1, width, outputHeight));
@@ -49,9 +51,8 @@ public class GUISplitter extends GUIComponent
                ColorDefinition c = BitVectorFormatter.formatAsColor(inputEnd);
                if (c != null)
                        gc.setForeground(ColorManager.current().toColor(c));
-               gc.drawLine(posX, posY + heightPerPin * logicWidth / 2, posX + width / 2, posY + heightPerPin * logicWidth / 2);
-               gc.setForeground(Preferences.current().getColor("net.mograsim.logic.model.color.foreground"));
-               gc.drawLine(posX + width / 2, posY, posX + width / 2, posY + heightPerPin * (logicWidth - 1));
+               double inLineY = posY + (logicWidth - 1) * heightPerPin / 2;
+               gc.drawLine(posX, inLineY, posX + width / 2, inLineY);
                double outputHeight = posY;
                for (int i = 0; i < logicWidth; i++, outputHeight += 10)
                {
@@ -60,6 +61,13 @@ public class GUISplitter extends GUIComponent
                                gc.setForeground(ColorManager.current().toColor(c));
                        gc.drawLine(posX + width / 2, outputHeight, posX + width, outputHeight);
                }
+               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));
+               gc.setLineCap(oldLineCap);
        }
 
        @Override