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=64031e27d6b607e5475d081f93581960ef5a82b4;hp=563f9284c473ed22101b3bf4c15ad0f50b50c1ec;hpb=b37ba7609a925cc945bbac0f6ead619d07912238;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 563f9284..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,13 +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.ModelVisitor;
 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
 {
@@ -40,12 +43,18 @@ 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");
+		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);
+		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)
@@ -90,12 +133,6 @@ public class GUIManualSwitch extends GUIComponent
 		return outputPin;
 	}
 
-	@Override
-	public void accept(ModelVisitor mv)
-	{
-		mv.visit(this);
-	}
-
 	static
 	{
 		ViewLogicModelAdapter.addComponentAdapter(new ManualSwitchAdapter());