X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2Fatomic%2FGUIManualSwitch.java;h=ab6e379b1247f513f1db30d5f78a25353307cf54;hb=61fe4ed550047992a3b67d7120b0a3dc10e13a75;hp=e4c183310e460b16e9d2c9fca82ff48578319630;hpb=db4075ec14984a406b863c153c873c17adc23dab;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java
index e4c18331..ab6e379b 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java
@@ -2,6 +2,9 @@ package net.mograsim.logic.model.model.components.atomic;
 
 import org.eclipse.swt.graphics.Color;
 
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Font;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
@@ -9,7 +12,7 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 import net.mograsim.logic.core.LogicObservable;
 import net.mograsim.logic.core.LogicObserver;
 import net.mograsim.logic.core.components.ManualSwitch;
-import net.mograsim.logic.core.types.Bit;
+import net.mograsim.logic.core.types.BitVector;
 import net.mograsim.logic.core.types.BitVectorFormatter;
 import net.mograsim.logic.core.wires.Wire.ReadEnd;
 import net.mograsim.logic.model.model.ViewModelModifiable;
@@ -17,6 +20,7 @@ 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.ManualSwitchAdapter;
+import net.mograsim.logic.model.serializing.IdentifierGetter;
 import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
 import net.mograsim.preferences.Preferences;
 
@@ -32,18 +36,18 @@ public class GUIManualSwitch extends GUIComponent
 	private ManualSwitch logicSwitch;
 	private ReadEnd end;
 
-	public GUIManualSwitch(ViewModelModifiable model)
+	public GUIManualSwitch(ViewModelModifiable model, int logicWidth)
 	{
-		this(model, null);
+		this(model, logicWidth, null);
 	}
 
-	public GUIManualSwitch(ViewModelModifiable model, String name)
+	public GUIManualSwitch(ViewModelModifiable model, int logicWidth, String name)
 	{
 		super(model, name);
-		logicObs = (i) -> requestRedraw();
+		logicObs = (i) -> model.requestRedraw();
 
 		setSize(width, height);
-		addPin(this.outputPin = new Pin(this, "", 1, width, height / 2));
+		addPin(this.outputPin = new Pin(this, "", logicWidth, width, height / 2));
 	}
 
 	@Override
@@ -88,7 +92,7 @@ public class GUIManualSwitch extends GUIComponent
 		{
 		case "out":
 			if (logicSwitch != null)
-				return logicSwitch.getValue();
+				return logicSwitch.getValues();
 			return null;
 		default:
 			return super.getHighLevelState(stateID);
@@ -102,7 +106,7 @@ public class GUIManualSwitch extends GUIComponent
 		{
 		case "out":
 			if (logicSwitch != null)
-				logicSwitch.setToValueOf((Bit) newState);
+				logicSwitch.setState((BitVector) newState);
 			break;
 		default:
 			super.setHighLevelState(stateID, newState);
@@ -140,9 +144,16 @@ public class GUIManualSwitch extends GUIComponent
 		return outputPin;
 	}
 
+	@Override
+	public JsonElement getParamsForSerializing(IdentifierGetter idGetter)
+	{
+		return new JsonPrimitive(outputPin.logicWidth);
+	}
+
 	static
 	{
 		ViewLogicModelAdapter.addComponentAdapter(new ManualSwitchAdapter());
-		IndirectGUIComponentCreator.setComponentSupplier(GUIManualSwitch.class.getName(), (m, p, n) -> new GUIManualSwitch(m, n));
+		IndirectGUIComponentCreator.setComponentSupplier(GUIManualSwitch.class.getName(),
+				(m, p, n) -> new GUIManualSwitch(m, p.getAsInt(), n));
 	}
 }
\ No newline at end of file