Fixed GUIMerger / GUISplitter bit order

[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 ad1d51e..5f0fe3a 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
@@ -48,10 +48,15 @@ public class GUIMerger extends GUIComponent
                double posX = getPosX();\r
                double posY = getPosY();\r
 \r
+               ColorDefinition c = BitVectorFormatter.formatAsColor(outputEnd);\r
+               if (c != null)\r
+                       gc.setForeground(ColorManager.current().toColor(c));\r
+               double outLineY = posY + (logicWidth - 1) * heightPerPin / 2;\r
+               gc.drawLine(posX + width / 2, outLineY, posX + width, outLineY);\r
                double inputHeight = posY;\r
                for (int i = 0; i < logicWidth; i++, inputHeight += 10)\r
                {\r
-                       ColorDefinition c = BitVectorFormatter.formatAsColor(inputEnds[i]);\r
+                       c = BitVectorFormatter.formatAsColor(inputEnds[i]);\r
                        if (c != null)\r
                                gc.setForeground(ColorManager.current().toColor(c));\r
                        gc.drawLine(posX, inputHeight, posX + width / 2, inputHeight);\r
@@ -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);\r
                gc.drawLine(posX + width / 2, posY, posX + width / 2, posY + heightPerPin * (logicWidth - 1));\r
                gc.setLineCap(oldLineCap);\r
-               ColorDefinition c = BitVectorFormatter.formatAsColor(outputEnd);\r
-               if (c != null)\r
-                       gc.setForeground(ColorManager.current().toColor(c));\r
-               double outLineY = posY + (logicWidth - 1) * heightPerPin / 2;\r
-               gc.drawLine(posX + width / 2, outLineY, posX + width, outLineY);\r
        }\r
 \r
        @Override\r