X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2FGUIManualSwitch.java;h=e88bfdf6cba20a3bd2b00f140fabcdc646c382da;hb=74bced7a3a38f65c65f3395cc422eb98e34da0b8;hp=8b9bcd90e59f08c39f2a185da9c88d9e41492a4e;hpb=4dca33ac72b3f476ab069d6627f5e824c4a55a5b;p=Mograsim.git

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIManualSwitch.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIManualSwitch.java
index 8b9bcd90..e88bfdf6 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIManualSwitch.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIManualSwitch.java
@@ -1,5 +1,7 @@
 package net.mograsim.logic.ui.model.components;
 
+import org.eclipse.swt.graphics.Color;
+
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Font;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
@@ -7,10 +9,14 @@ 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.BitVectorFormatter;
 import net.mograsim.logic.core.wires.Wire.ReadEnd;
 import net.mograsim.logic.ui.model.ViewModelModifiable;
 import net.mograsim.logic.ui.model.wires.Pin;
+import net.mograsim.logic.ui.modeladapter.ViewLogicModelAdapter;
+import net.mograsim.logic.ui.modeladapter.componentadapters.ManualSwitchAdapter;
+import net.mograsim.preferences.Preferences;
 
 public class GUIManualSwitch extends GUIComponent
 {
@@ -30,23 +36,26 @@ public class GUIManualSwitch extends GUIComponent
 		logicObs = (i) -> requestRedraw();
 
 		setSize(width, height);
-		addPin(this.outputPin = new Pin(this, 1, width, height / 2));
+		addPin(this.outputPin = new Pin(this, "", 1, width, height / 2));
 	}
 
 	@Override
 	public void render(GeneralGC gc, Rectangle visibleRegion)
 	{
-		double posX = getBounds().x;
-		double posY = getBounds().y;
-
 		// TODO maybe draw switch state too?
+		Color foreground = Preferences.current().getColor("net.mograsim.logic.ui.color.foreground");
+		if (foreground != null)
+			gc.setForeground(foreground);
 		gc.drawRectangle(getBounds());
 		String label = BitVectorFormatter.formatValueAsString(end);
 		Font oldFont = gc.getFont();
 		Font labelFont = new Font(oldFont.getName(), fontHeight, oldFont.getStyle());
 		gc.setFont(labelFont);
 		Point textExtent = gc.textExtent(label);
-		gc.drawText(label, posX + (width - textExtent.x) / 2, posY + (height - textExtent.y) / 2, true);
+		Color textColor = Preferences.current().getColor("net.mograsim.logic.ui.color.text");
+		if (textColor != null)
+			gc.setForeground(textColor);
+		gc.drawText(label, getPosX() + (width - textExtent.x) / 2, getPosY() + (height - textExtent.y) / 2, true);
 		gc.setFont(oldFont);
 	}
 
@@ -60,6 +69,40 @@ public class GUIManualSwitch extends GUIComponent
 		registerLogicObs(logicSwitch);
 	}
 
+	public boolean hasLogicModelBinding()
+	{
+		return logicSwitch != null;
+	}
+
+	@Override
+	public void setHighLevelState(String stateID, Object newState)
+	{
+		switch (stateID)
+		{
+		case "out":
+			if (logicSwitch != null)
+				logicSwitch.setToValueOf((Bit) newState);
+			break;
+		default:
+			super.setHighLevelState(stateID, newState);
+			break;
+		}
+	}
+
+	@Override
+	public Object getHighLevelState(String stateID)
+	{
+		switch (stateID)
+		{
+		case "out":
+			if (logicSwitch != null)
+				return logicSwitch.getValue();
+			return null;
+		default:
+			return super.getHighLevelState(stateID);
+		}
+	}
+
 	private void registerLogicObs(LogicObservable observable)
 	{
 		if (observable != null)
@@ -80,8 +123,18 @@ public class GUIManualSwitch extends GUIComponent
 		return true;
 	}
 
+	public ManualSwitch getManualSwitch()
+	{
+		return logicSwitch;
+	}
+
 	public Pin getOutputPin()
 	{
 		return outputPin;
 	}
+
+	static
+	{
+		ViewLogicModelAdapter.addComponentAdapter(new ManualSwitchAdapter());
+	}
 }
\ No newline at end of file