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 fc1743b..3ea238d 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;
 
 public class GUIMerger extends GUIComponent
 {
-       private static final double width = 20;
+       private static final double width = 10;
        private static final double heightPerPin = 10;
 
        public final int logicWidth;
 
-       private ReadEnd[] inputEnds;
+       private final ReadEnd[] inputEnds;
        private ReadEnd outputEnd;
 
        public GUIMerger(ViewModelModifiable model, int logicWidth, String name)
@@ -36,7 +36,8 @@ public class GUIMerger extends GUIComponent
                double inputHeight = 0;
                for (int i = 0; i < logicWidth; i++, inputHeight += 10)
                        addPin(new Pin(this, "I" + i, 1, 0, inputHeight));
-               addPin(new Pin(this, "O", logicWidth, width, logicWidth * heightPerPin / 2));
+               addPin(new Pin(this, "O", logicWidth, width, (logicWidth - 1) * heightPerPin / 2));
+               inputEnds = new ReadEnd[logicWidth];
        }
 
        @Override
@@ -58,7 +59,8 @@ public class GUIMerger extends GUIComponent
                ColorDefinition c = BitVectorFormatter.formatAsColor(outputEnd);
                if (c != null)
                        gc.setForeground(ColorManager.current().toColor(c));
-               gc.drawLine(posX + width / 2, posY + heightPerPin * logicWidth / 2, posX + width, posY + heightPerPin * logicWidth / 2);
+               double outLineY = posY + (logicWidth - 1) * heightPerPin / 2;
+               gc.drawLine(posX + width / 2, outLineY, posX + width, outLineY);
        }
 
        @Override
@@ -69,7 +71,7 @@ public class GUIMerger extends GUIComponent
 
        public void setLogicModelBinding(ReadEnd[] inputEnds, ReadEnd outputEnd)
        {
-               this.inputEnds = inputEnds;
+               System.arraycopy(inputEnds, 0, this.inputEnds, 0, logicWidth);
                this.outputEnd = outputEnd;
        }