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=563f9284c473ed22101b3bf4c15ad0f50b50c1ec;hb=19b9fa6c1cfcd7036c5b0c44c892f029cd04879b;hp=486639e5ff8cf08f6e0df1261b08c5ee57c10b78;hpb=da27eee93b1893199dde2b0935cafdb1c6301279;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 486639e5..563f9284 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,67 +1,103 @@
-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.components.ManualSwitch;
-import net.mograsim.logic.core.types.BitVectorFormatter;
-import net.mograsim.logic.core.wires.Wire.ReadEnd;
-
-public class GUIManualSwitch extends GUIComponent
-{
-	private static final double width = 20;
-	private static final double height = 15;
-	private static final double fontHeight = 5;
-
-	private final Pin outputPin;
-
-	private ManualSwitch logicSwitch;
-	private ReadEnd end;
-
-	public GUIManualSwitch(ViewModel model)
-	{
-		super(model);
-		setSize(width, height);
-		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;
-
-		gc.drawRectangle(posX, posY, width, height);
-		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);
-		gc.setFont(oldFont);
-	}
-
-	public void setLogicModelBinding(ManualSwitch logicSwitch, ReadEnd end)
-	{
-		this.logicSwitch = logicSwitch;
-		this.end = end;
-		// TODO when ManualSwitch supports it, add listeners
-		end.registerObserver((i) -> callComponentLookChangedListeners());
-	}
-
-	@Override
-	public boolean clicked(double x, double y)
-	{
-		if (logicSwitch != null)
-			logicSwitch.toggle();
-		return true;
-	}
-
-	public Pin getOutputPin()
-	{
-		return outputPin;
-	}
+package net.mograsim.logic.ui.model.components;
+
+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.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;
+
+public class GUIManualSwitch extends GUIComponent
+{
+	private static final double width = 20;
+	private static final double height = 15;
+	private static final double fontHeight = 5;
+
+	private final Pin outputPin;
+
+	private final LogicObserver logicObs;
+	private ManualSwitch logicSwitch;
+	private ReadEnd end;
+
+	public GUIManualSwitch(ViewModelModifiable model)
+	{
+		super(model);
+		logicObs = (i) -> requestRedraw();
+
+		setSize(width, height);
+		addPin(this.outputPin = new Pin(this, "", 1, width, height / 2));
+	}
+
+	@Override
+	public void render(GeneralGC gc, Rectangle visibleRegion)
+	{
+		// TODO maybe draw switch state too?
+		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, getPosX() + (width - textExtent.x) / 2, getPosY() + (height - textExtent.y) / 2, true);
+		gc.setFont(oldFont);
+	}
+
+	public void setLogicModelBinding(ManualSwitch logicSwitch, ReadEnd end)
+	{
+		deregisterLogicObs(this.end);
+		deregisterLogicObs(this.logicSwitch);
+		this.logicSwitch = logicSwitch;
+		this.end = end;
+		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
+	public boolean clicked(double x, double y)
+	{
+		if (logicSwitch != null)
+			logicSwitch.toggle();
+		return true;
+	}
+
+	public ManualSwitch getManualSwitch()
+	{
+		return logicSwitch;
+	}
+
+	public Pin getOutputPin()
+	{
+		return outputPin;
+	}
+
+	@Override
+	public void accept(ModelVisitor mv)
+	{
+		mv.visit(this);
+	}
+
+	static
+	{
+		ViewLogicModelAdapter.addComponentAdapter(new ManualSwitchAdapter());
+	}
 }
\ No newline at end of file