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=0993024d518e3ba305a6e8c27fc76fe9d28bb065;hb=9c142c9ad59d2af070ebb6495b1ca48242da62d8;hp=a8d271e17aa5e7f295528aeae3a5bcd1635c88e5;hpb=f338e2a024c8edca6ab72230747ea5e4889d8b0b;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 a8d271e1..0993024d 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,14 +1,16 @@
 package net.mograsim.logic.ui.model.components;
 
-import net.mograsim.logic.ui.model.ViewModel;
-import net.mograsim.logic.ui.model.wires.Pin;
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Font;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 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.BitVectorFormatter;
 import net.mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.logic.ui.model.ViewModelModifiable;
+import net.mograsim.logic.ui.model.wires.Pin;
 
 public class GUIManualSwitch extends GUIComponent
 {
@@ -18,12 +20,15 @@ public class GUIManualSwitch extends GUIComponent
 
 	private final Pin outputPin;
 
+	private final LogicObserver logicObs;
 	private ManualSwitch logicSwitch;
 	private ReadEnd end;
 
-	public GUIManualSwitch(ViewModel model)
+	public GUIManualSwitch(ViewModelModifiable model)
 	{
 		super(model);
+		logicObs = (i) -> requestRedraw();
+
 		setSize(width, height);
 		addPin(this.outputPin = new Pin(this, 1, width, height / 2));
 	}
@@ -34,6 +39,7 @@ public class GUIManualSwitch extends GUIComponent
 		double posX = getBounds().x;
 		double posY = getBounds().y;
 
+		// TODO maybe draw switch state too?
 		gc.drawRectangle(posX, posY, width, height);
 		String label = BitVectorFormatter.formatValueAsString(end);
 		Font oldFont = gc.getFont();
@@ -46,10 +52,24 @@ public class GUIManualSwitch extends GUIComponent
 
 	public void setLogicModelBinding(ManualSwitch logicSwitch, ReadEnd end)
 	{
+		deregisterLogicObs(this.end);
+		deregisterLogicObs(this.logicSwitch);
 		this.logicSwitch = logicSwitch;
 		this.end = end;
-		// TODO when ManualSwitch supports it, add listeners
-		end.registerObserver((i) -> callComponentLookChangedListeners());
+		registerLogicObs(end);
+		registerLogicObs(logicSwitch);
+	}
+
+	private void registerLogicObs(LogicObservable observable)
+	{
+		if (observable != null)
+			observable.registerObserver(logicObs);
+	}
+
+	private void deregisterLogicObs(LogicObservable observable)
+	{
+		if (observable != null)
+			observable.deregisterObserver(logicObs);
 	}
 
 	@Override