Fixed GUIMerger / GUISplitter bit order

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

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 08ce951..b283f46 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
@@ -53,13 +53,6 @@ public class GUISplitter extends GUIComponent
                        gc.setForeground(ColorManager.current().toColor(c));\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
-               int oldLineCap = gc.getLineCap();\r
-               int lineJoin = gc.getLineJoin();\r
-               // TODO find better "replacement" for JOIN_BEVEL\r
-               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
                double outputHeight = posY;\r
                for (int i = 0; i < logicWidth; i++, outputHeight += 10)\r
                {\r
@@ -68,6 +61,13 @@ public class GUISplitter extends GUIComponent
                                gc.setForeground(ColorManager.current().toColor(c));\r
                        gc.drawLine(posX + width / 2, outputHeight, posX + width, outputHeight);\r
                }\r
+               gc.setForeground(Preferences.current().getColor("net.mograsim.logic.model.color.foreground"));\r
+               int oldLineCap = gc.getLineCap();\r
+               int lineJoin = gc.getLineJoin();\r
+               // TODO find better "replacement" for JOIN_BEVEL\r
+               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
        }\r
 \r
        @Override\r

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/MergerAdapter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/MergerAdapter.java
index b5d20bc..7a1d0e9 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/MergerAdapter.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/MergerAdapter.java
@@ -26,7 +26,7 @@ public class MergerAdapter implements ComponentAdapter<GUIMerger>
                for (int i = 0; i < guiComponent.logicWidth; i++)\r
                {\r
                        Wire input = logicWiresPerPin.get(guiComponent.getPin("I" + i));\r
-                       Wire.fuse(input, output, 0, i, 1);\r
+                       Wire.fuse(input, output, 0, guiComponent.logicWidth - 1 - i, 1);\r
                        inputEnds[i] = input.createReadOnlyEnd();\r
                }\r
                guiComponent.setLogicModelBinding(inputEnds, output.createReadOnlyEnd());\r

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/SplitterAdapter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/SplitterAdapter.java
index 232015f..223d2b7 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/SplitterAdapter.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/SplitterAdapter.java
@@ -26,7 +26,7 @@ public class SplitterAdapter implements ComponentAdapter<GUISplitter>
                for (int i = 0; i < guiComponent.logicWidth; i++)\r
                {\r
                        Wire output = logicWiresPerPin.get(guiComponent.getPin("O" + i));\r
-                       Wire.fuse(input, output, i, 0, 1);\r
+                       Wire.fuse(input, output, guiComponent.logicWidth - 1 - i, 0, 1);\r
                        outputEnds[i] = output.createReadOnlyEnd();\r
                }\r
                guiComponent.setLogicModelBinding(input.createReadOnlyEnd(), outputEnds);\r