Made GUIMerger and GUISplitter symmetrical

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 40f9ebd..a287dd8 100644 (file)
--- 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
@@ -36,7 +36,7 @@ public class GUIMerger extends GUIComponent
                double inputHeight = 0;\r
                for (int i = 0; i < logicWidth; i++, inputHeight += 10)\r
                        addPin(new Pin(this, "I" + i, 1, 0, inputHeight));\r
-               addPin(new Pin(this, "O", logicWidth, width, logicWidth * heightPerPin / 2));\r
+               addPin(new Pin(this, "O", logicWidth, width, (logicWidth - 1) * heightPerPin / 2));\r
                inputEnds = new ReadEnd[logicWidth];\r
        }\r
 \r
@@ -59,7 +59,8 @@ public class GUIMerger extends GUIComponent
                ColorDefinition c = BitVectorFormatter.formatAsColor(outputEnd);\r
                if (c != null)\r
                        gc.setForeground(ColorManager.current().toColor(c));\r
-               gc.drawLine(posX + width / 2, posY + heightPerPin * logicWidth / 2, posX + width, posY + heightPerPin * logicWidth / 2);\r
+               double outLineY = posY + (logicWidth - 1) * heightPerPin / 2;\r
+               gc.drawLine(posX + width / 2, outLineY, posX + width, outLineY);\r
        }\r
 \r
        @Override\r

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 06cfe17..1ffe79d 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
@@ -33,7 +33,7 @@ public class GUISplitter extends GUIComponent
                super(model, name);\r
                this.logicWidth = logicWidth;\r
                setSize(width, logicWidth * heightPerPin);\r
-               addPin(new Pin(this, "I", logicWidth, 0, logicWidth * heightPerPin / 2));\r
+               addPin(new Pin(this, "I", logicWidth, 0, (logicWidth - 1) * heightPerPin / 2));\r
                double outputHeight = 0;\r
                for (int i = 0; i < logicWidth; i++, outputHeight += 10)\r
                        addPin(new Pin(this, "O" + i, 1, width, outputHeight));\r
@@ -49,7 +49,8 @@ public class GUISplitter extends GUIComponent
                ColorDefinition c = BitVectorFormatter.formatAsColor(inputEnd);\r
                if (c != null)\r
                        gc.setForeground(ColorManager.current().toColor(c));\r
-               gc.drawLine(posX, posY + heightPerPin * logicWidth / 2, posX + width / 2, posY + heightPerPin * logicWidth / 2);\r
+               double inLineY = posY + (logicWidth - 1) * heightPerPin / 2;\r
+               gc.drawLine(posX, inLineY, posX + width / 2, inLineY);\r
                gc.setForeground(Preferences.current().getColor("net.mograsim.logic.model.color.foreground"));\r
                gc.drawLine(posX + width / 2, posY, posX + width / 2, posY + heightPerPin * (logicWidth - 1));\r
                double outputHeight = posY;\r