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=611d3410a3ea6c2bc02c08140d61452b5fc601aa;hb=b85bdb8de9e5a762a878dff3123a04d2458a1578;hp=2fd1749d30278af59cc4377d6742e0d5b3e4e885;hpb=1ddc8ecf420fd4ccbe351c0cbd58cc9f5792f0c7;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..611d3410 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
@@ -40,7 +40,7 @@ public class GUIManualSwitch extends GUIComponent
 	public GUIManualSwitch(ViewModelModifiable model, 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));
@@ -50,7 +50,7 @@ public class GUIManualSwitch extends GUIComponent
 	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.getValue();
+			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.setToValueOf((Bit) newState);
+			break;
 		default:
-			return super.getHighLevelState(stateID);
+			super.setHighLevelState(stateID, newState);
+			break;
 		}
 	}