Fixed GUIMerger/GUISplitter rendering

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

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 656c91f..4d29042 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
@@ -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)