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=1d3851621e1f85d9ac5cbc10eb7a14736b938129;hb=8c26f70ef8444eae412b35805de3fd43fe3ef345;hp=2fd1749d30278af59cc4377d6742e0d5b3e4e885;hpb=b5d8c2d71e27350ea7c9314e40df5bb0584271cd;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 2fd1749d..1d385162 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
@@ -9,7 +9,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;
@@ -32,25 +32,25 @@ 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
 	public void render(GeneralGC gc, Rectangle visibleRegion)
 	{
 		// TODO maybe draw switch state too?
-		Color foreground = Preferences.current().getColor("net.mograsim.logic.ui.color.foreground");
+		Color foreground = Preferences.current().getColor("net.mograsim.logic.model.color.foreground");
 		if (foreground != null)
 			gc.setForeground(foreground);
 		gc.drawRectangle(getBounds());
@@ -59,7 +59,7 @@ public class GUIManualSwitch extends GUIComponent
 		Font labelFont = new Font(oldFont.getName(), fontHeight, oldFont.getStyle());
 		gc.setFont(labelFont);
 		Point textExtent = gc.textExtent(label);
-		Color textColor = Preferences.current().getColor("net.mograsim.logic.ui.color.text");
+		Color textColor = Preferences.current().getColor("net.mograsim.logic.model.color.text");
 		if (textColor != null)
 			gc.setForeground(textColor);
 		gc.drawText(label, getPosX() + (width - textExtent.x) / 2, getPosY() + (height - textExtent.y) / 2, true);
@@ -82,31 +82,31 @@ public class GUIManualSwitch extends GUIComponent
 	}
 
 	@Override
-	public void setHighLevelState(String stateID, Object newState)
+	public Object getHighLevelState(String stateID)
 	{
 		switch (stateID)
 		{
 		case "out":
 			if (logicSwitch != null)
-				logicSwitch.setToValueOf((Bit) newState);
-			break;
+				return logicSwitch.getValues();
+			return null;
 		default:
-			super.setHighLevelState(stateID, newState);
-			break;
+			return super.getHighLevelState(stateID);
 		}
 	}
 
 	@Override
-	public Object getHighLevelState(String stateID)
+	public void setHighLevelState(String stateID, Object newState)
 	{
 		switch (stateID)
 		{
 		case "out":
 			if (logicSwitch != null)
-				return logicSwitch.getValue();
-			return null;
+				logicSwitch.setState((BitVector) newState);
+			break;
 		default:
-			return super.getHighLevelState(stateID);
+			super.setHighLevelState(stateID, newState);
+			break;
 		}
 	}
 
@@ -143,6 +143,7 @@ public class GUIManualSwitch extends GUIComponent
 	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