Made GUIMerger and GUISplitter symmetrical

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

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 2211114..ab97f53 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
@@ -20,23 +20,24 @@ import net.mograsim.preferences.Preferences;
 
 public class GUISplitter 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 inputEnd;
-       private ReadEnd[] outputEnds;
+       private final ReadEnd[] outputEnds;
 
        public GUISplitter(ViewModelModifiable model, int logicWidth, String name)
        {
                super(model, name);
                this.logicWidth = logicWidth;
                setSize(width, logicWidth * heightPerPin);
-               addPin(new Pin(this, "I", logicWidth, 0, logicWidth * heightPerPin / 2));
+               addPin(new Pin(this, "I", logicWidth, 0, (logicWidth - 1) * heightPerPin / 2));
                double outputHeight = 0;
                for (int i = 0; i < logicWidth; i++, outputHeight += 10)
                        addPin(new Pin(this, "O" + i, 1, width, outputHeight));
+               outputEnds = new ReadEnd[logicWidth];
        }
 
        @Override
@@ -48,7 +49,8 @@ public class GUISplitter extends GUIComponent
                ColorDefinition c = BitVectorFormatter.formatAsColor(inputEnd);
                if (c != null)
                        gc.setForeground(ColorManager.current().toColor(c));
-               gc.drawLine(posX, posY + heightPerPin * logicWidth / 2, posX + width / 2, posY + heightPerPin * logicWidth / 2);
+               double inLineY = posY + (logicWidth - 1) * heightPerPin / 2;
+               gc.drawLine(posX, inLineY, posX + width / 2, inLineY);
                gc.setForeground(Preferences.current().getColor("net.mograsim.logic.model.color.foreground"));
                gc.drawLine(posX + width / 2, posY, posX + width / 2, posY + heightPerPin * (logicWidth - 1));
                double outputHeight = posY;
@@ -70,7 +72,7 @@ public class GUISplitter extends GUIComponent
        public void setLogicModelBinding(ReadEnd inputEnd, ReadEnd[] outputEnds)
        {
                this.inputEnd = inputEnd;
-               this.outputEnds = outputEnds;
+               System.arraycopy(outputEnds, 0, this.outputEnds, 0, logicWidth);
        }
 
        static