Made GUIMerger and GUISplitter symmetrical

[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 287e437..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
@@ -20,12 +20,12 @@ import net.mograsim.preferences.Preferences;
 \r
 public class GUIMerger extends GUIComponent\r
 {\r
-       private static final double width = 20;\r
+       private static final double width = 10;\r
        private static final double heightPerPin = 10;\r
 \r
        public final int logicWidth;\r
 \r
-       private ReadEnd[] inputEnds;\r
+       private final ReadEnd[] inputEnds;\r
        private ReadEnd outputEnd;\r
 \r
        public GUIMerger(ViewModelModifiable model, int logicWidth, String name)\r
@@ -36,7 +36,8 @@ 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
        @Override\r
@@ -58,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
@@ -69,7 +71,7 @@ public class GUIMerger extends GUIComponent
 \r
        public void setLogicModelBinding(ReadEnd[] inputEnds, ReadEnd outputEnd)\r
        {\r
-               this.inputEnds = inputEnds;\r
+               System.arraycopy(inputEnds, 0, this.inputEnds, 0, logicWidth);\r
                this.outputEnd = outputEnd;\r
        }\r
 \r