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 8643eb3..1ffe79d 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
@@ -1,5 +1,8 @@
 package net.mograsim.logic.model.model.components.atomic;\r
 \r
+import com.google.gson.JsonElement;\r
+import com.google.gson.JsonPrimitive;\r
+\r
 import net.haspamelodica.swt.helper.gcs.GeneralGC;\r
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;\r
 import net.mograsim.logic.core.types.BitVectorFormatter;\r
@@ -9,29 +12,32 @@ import net.mograsim.logic.model.model.components.GUIComponent;
 import net.mograsim.logic.model.model.wires.Pin;\r
 import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter;\r
 import net.mograsim.logic.model.modeladapter.componentadapters.SplitterAdapter;\r
+import net.mograsim.logic.model.serializing.IdentifierGetter;\r
+import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;\r
 import net.mograsim.preferences.ColorDefinition;\r
 import net.mograsim.preferences.ColorManager;\r
 import net.mograsim.preferences.Preferences;\r
 \r
 public class GUISplitter 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 inputEnd;\r
-       private ReadEnd[] outputEnds;\r
+       private final ReadEnd[] outputEnds;\r
 \r
        public GUISplitter(ViewModelModifiable model, int logicWidth, String name)\r
        {\r
                super(model, name);\r
                this.logicWidth = logicWidth;\r
                setSize(width, logicWidth * heightPerPin);\r
-               addPin(new Pin(this, "I", logicWidth, 0, logicWidth * heightPerPin / 2));\r
+               addPin(new Pin(this, "I", logicWidth, 0, (logicWidth - 1) * heightPerPin / 2));\r
                double outputHeight = 0;\r
                for (int i = 0; i < logicWidth; i++, outputHeight += 10)\r
                        addPin(new Pin(this, "O" + i, 1, width, outputHeight));\r
+               outputEnds = new ReadEnd[logicWidth];\r
        }\r
 \r
        @Override\r
@@ -43,7 +49,8 @@ public class GUISplitter extends GUIComponent
                ColorDefinition c = BitVectorFormatter.formatAsColor(inputEnd);\r
                if (c != null)\r
                        gc.setForeground(ColorManager.current().toColor(c));\r
-               gc.drawLine(posX, posY + heightPerPin * logicWidth / 2, posX + width / 2, posY + heightPerPin * logicWidth / 2);\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
                gc.drawLine(posX + width / 2, posY, posX + width / 2, posY + heightPerPin * (logicWidth - 1));\r
                double outputHeight = posY;\r
@@ -56,14 +63,22 @@ public class GUISplitter extends GUIComponent
                }\r
        }\r
 \r
+       @Override\r
+       public JsonElement getParamsForSerializing(IdentifierGetter idGetter)\r
+       {\r
+               return new JsonPrimitive(logicWidth);\r
+       }\r
+\r
        public void setLogicModelBinding(ReadEnd inputEnd, ReadEnd[] outputEnds)\r
        {\r
                this.inputEnd = inputEnd;\r
-               this.outputEnds = outputEnds;\r
+               System.arraycopy(outputEnds, 0, this.outputEnds, 0, logicWidth);\r
        }\r
 \r
        static\r
        {\r
                ViewLogicModelAdapter.addComponentAdapter(new SplitterAdapter());\r
+               IndirectGUIComponentCreator.setComponentSupplier(GUISplitter.class.getCanonicalName(),\r
+                               (m, p, n) -> new GUISplitter(m, p.getAsInt(), n));\r
        }\r
 }
\ No newline at end of file