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 509e575..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
@@ -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,18 +12,20 @@ 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.MergerAdapter;\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 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
@@ -31,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
@@ -53,17 +59,26 @@ 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
+       public JsonElement getParamsForSerializing(IdentifierGetter idGetter)\r
+       {\r
+               return new JsonPrimitive(logicWidth);\r
        }\r
 \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
        static\r
        {\r
                ViewLogicModelAdapter.addComponentAdapter(new MergerAdapter());\r
+               IndirectGUIComponentCreator.setComponentSupplier(GUIMerger.class.getCanonicalName(),\r
+                               (m, p, n) -> new GUIMerger(m, p.getAsInt(), n));\r
        }\r
 }
\ No newline at end of file