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=9527279d2a9606dd5f054cb89888865bf92117f4;hb=c202aac61021b9d12e4ac6495001bcd012cecde0;hp=6283c507770e79ddd7bc6f52c8abae9ffcc68701;hpb=ee907559f02192495043a97fc401cb4abad77137;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 6283c507..9527279d 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
@@ -2,9 +2,6 @@ package net.mograsim.logic.model.model.components.atomic;
 
 import org.eclipse.swt.SWT;
 
-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;
@@ -12,6 +9,7 @@ import net.mograsim.logic.core.wires.Wire.ReadEnd;
 import net.mograsim.logic.model.model.ViewModelModifiable;
 import net.mograsim.logic.model.model.components.GUIComponent;
 import net.mograsim.logic.model.model.wires.Pin;
+import net.mograsim.logic.model.model.wires.PinUsage;
 import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter;
 import net.mograsim.logic.model.modeladapter.componentadapters.SplitterAdapter;
 import net.mograsim.logic.model.serializing.IdentifierGetter;
@@ -26,19 +24,25 @@ public class GUISplitter extends GUIComponent
 	private static final double heightPerPin = 10;
 
 	public final int logicWidth;
+	private final Pin inputPin;
 
 	private ReadEnd inputEnd;
 	private final ReadEnd[] outputEnds;
 
+	public GUISplitter(ViewModelModifiable model, int logicWidth)
+	{
+		this(model, logicWidth, null);
+	}
+
 	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 - 1) * heightPerPin / 2));
-		double outputHeight = 0;
-		for (int i = 0; i < logicWidth; i++, outputHeight += 10)
-			addPin(new Pin(this, "O" + i, 1, width, outputHeight));
+		setSize(width, (logicWidth - 1) * heightPerPin);
+		addPin(this.inputPin = new Pin(this, "I", logicWidth, PinUsage.TRISTATE, 0, (logicWidth - 1) * heightPerPin / 2));
+		double outputHeight = (logicWidth - 1) * heightPerPin;
+		for (int i = 0; i < logicWidth; i++, outputHeight -= 10)
+			addPin(new Pin(this, "O" + i, 1, PinUsage.TRISTATE, width, outputHeight));
 		outputEnds = new ReadEnd[logicWidth];
 	}
 
@@ -53,6 +57,14 @@ public class GUISplitter extends GUIComponent
 			gc.setForeground(ColorManager.current().toColor(c));
 		double inLineY = posY + (logicWidth - 1) * heightPerPin / 2;
 		gc.drawLine(posX, inLineY, posX + width / 2, inLineY);
+		double outputHeight = posY + (logicWidth - 1) * heightPerPin;
+		for (int i = 0; i < logicWidth; i++, outputHeight -= 10)
+		{
+			c = BitVectorFormatter.formatAsColor(outputEnds[i]);
+			if (c != null)
+				gc.setForeground(ColorManager.current().toColor(c));
+			gc.drawLine(posX + width / 2, outputHeight, posX + width, outputHeight);
+		}
 		gc.setForeground(Preferences.current().getColor("net.mograsim.logic.model.color.foreground"));
 		int oldLineCap = gc.getLineCap();
 		int lineJoin = gc.getLineJoin();
@@ -60,20 +72,12 @@ public class GUISplitter extends GUIComponent
 		gc.setLineCap(lineJoin == SWT.JOIN_MITER ? SWT.CAP_SQUARE : lineJoin == SWT.JOIN_ROUND ? SWT.CAP_ROUND : SWT.CAP_SQUARE);
 		gc.drawLine(posX + width / 2, posY, posX + width / 2, posY + heightPerPin * (logicWidth - 1));
 		gc.setLineCap(oldLineCap);
-		double outputHeight = posY;
-		for (int i = 0; i < logicWidth; i++, outputHeight += 10)
-		{
-			c = BitVectorFormatter.formatAsColor(outputEnds[i]);
-			if (c != null)
-				gc.setForeground(ColorManager.current().toColor(c));
-			gc.drawLine(posX + width / 2, outputHeight, posX + width, outputHeight);
-		}
 	}
 
 	@Override
-	public JsonElement getParamsForSerializing(IdentifierGetter idGetter)
+	public Integer getParamsForSerializing(IdentifierGetter idGetter)
 	{
-		return new JsonPrimitive(logicWidth);
+		return logicWidth;
 	}
 
 	public void setLogicModelBinding(ReadEnd inputEnd, ReadEnd[] outputEnds)
@@ -82,6 +86,11 @@ public class GUISplitter extends GUIComponent
 		System.arraycopy(outputEnds, 0, this.outputEnds, 0, logicWidth);
 	}
 
+	public Pin getInputPin()
+	{
+		return inputPin;
+	}
+
 	static
 	{
 		ViewLogicModelAdapter.addComponentAdapter(new SplitterAdapter());