X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2Fatomic%2FGUISplitter.java;h=1ffe79d13d76a44304c78c5f71b62f62d7a7a508;hb=7ee61bc42cce098b93fa9b90ab0cb9f855a9c398;hp=8643eb36f2ed97fe843af7a69724c233d06ab45d;hpb=956e037d5e5449e395554affe572ac6a6e9b996f;p=Mograsim.git

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 8643eb36..1ffe79d1 100644
--- 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;
 
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 import net.mograsim.logic.core.types.BitVectorFormatter;
@@ -9,29 +12,32 @@ import net.mograsim.logic.model.model.components.GUIComponent;
 import net.mograsim.logic.model.model.wires.Pin;
 import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter;
 import net.mograsim.logic.model.modeladapter.componentadapters.SplitterAdapter;
+import net.mograsim.logic.model.serializing.IdentifierGetter;
+import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
 import net.mograsim.preferences.ColorDefinition;
 import net.mograsim.preferences.ColorManager;
 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
@@ -43,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;
@@ -56,14 +63,22 @@ public class GUISplitter extends GUIComponent
 		}
 	}
 
+	@Override
+	public JsonElement getParamsForSerializing(IdentifierGetter idGetter)
+	{
+		return new JsonPrimitive(logicWidth);
+	}
+
 	public void setLogicModelBinding(ReadEnd inputEnd, ReadEnd[] outputEnds)
 	{
 		this.inputEnd = inputEnd;
-		this.outputEnds = outputEnds;
+		System.arraycopy(outputEnds, 0, this.outputEnds, 0, logicWidth);
 	}
 
 	static
 	{
 		ViewLogicModelAdapter.addComponentAdapter(new SplitterAdapter());
+		IndirectGUIComponentCreator.setComponentSupplier(GUISplitter.class.getCanonicalName(),
+				(m, p, n) -> new GUISplitter(m, p.getAsInt(), n));
 	}
 }
\ No newline at end of file