X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2Fmi%2Fnandbased%2FGUIdlatch.java;h=e0a60386a2bc9bb1839d4e2259f2239833629d5c;hb=5ece0acf049bf9af2933f513fe0206565681f622;hp=f6246a44fe738b4c089842c8874806f0b944737d;hpb=b37ba7609a925cc945bbac0f6ead619d07912238;p=Mograsim.git

diff --git a/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdlatch.java b/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdlatch.java
index f6246a44..e0a60386 100644
--- a/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdlatch.java
+++ b/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdlatch.java
@@ -2,17 +2,25 @@ package net.mograsim.logic.ui.model.components.mi.nandbased;
 
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 import net.mograsim.logic.ui.model.ViewModelModifiable;
-import net.mograsim.logic.ui.model.components.GUINandGate;
-import net.mograsim.logic.ui.model.components.SimpleRectangularSubmodelComponent;
+import net.mograsim.logic.ui.model.components.atomic.GUINandGate;
+import net.mograsim.logic.ui.model.components.submodels.SimpleRectangularSubmodelComponent;
 import net.mograsim.logic.ui.model.wires.GUIWire;
 import net.mograsim.logic.ui.model.wires.Pin;
 import net.mograsim.logic.ui.model.wires.WireCrossPoint;
+import net.mograsim.logic.ui.serializing.IndirectGUIComponentCreator;
 
 public class GUIdlatch extends SimpleRectangularSubmodelComponent
 {
+	private GUI_rsLatch _rsLatch;
+
 	public GUIdlatch(ViewModelModifiable model)
 	{
-		super(model, 1, "GUIdlatch");
+		this(model, null);
+	}
+
+	public GUIdlatch(ViewModelModifiable model, String name)
+	{
+		super(model, 1, "GUIdlatch", name);
 		setSubmodelScale(.4);
 		setInputPins("D", "E");
 		setOutputPins("Q", "_Q");
@@ -29,7 +37,7 @@ public class GUIdlatch extends SimpleRectangularSubmodelComponent
 
 		GUINandGate nand1 = new GUINandGate(submodelModifiable, 1);
 		GUINandGate nand2 = new GUINandGate(submodelModifiable, 1);
-		GUI_rsLatch _rsLatch = new GUI_rsLatch(submodelModifiable);
+		_rsLatch = new GUI_rsLatch(submodelModifiable);
 
 		WireCrossPoint cp1 = new WireCrossPoint(submodelModifiable, 1);
 		WireCrossPoint cp2 = new WireCrossPoint(submodelModifiable, 1);
@@ -50,5 +58,39 @@ public class GUIdlatch extends SimpleRectangularSubmodelComponent
 		new GUIWire(submodelModifiable, nand2.getPin("Y"), _rsLatch.getPin("_R"), new Point(40, 37.5), new Point(40, 22.5));
 		new GUIWire(submodelModifiable, _rsLatch.getPin("Q"), Q, new Point[0]);
 		new GUIWire(submodelModifiable, _rsLatch.getPin("_Q"), _Q);
+
+		addAtomicHighLevelStateID("q");
+	}
+
+	@Override
+	public void setAtomicHighLevelState(String stateID, Object newState)
+	{
+		switch (stateID)
+		{
+		case "q":
+			_rsLatch.setHighLevelState("q", newState);
+			break;
+		default:
+			// should not happen because we tell SubmodelComponent to only allow these state IDs.
+			throw new IllegalStateException("Illegal atomic state ID: " + stateID);
+		}
+	}
+
+	@Override
+	public Object getAtomicHighLevelState(String stateID)
+	{
+		switch (stateID)
+		{
+		case "q":
+			return _rsLatch.getHighLevelState("q");
+		default:
+			// should not happen because we tell SubmodelComponent to only allow these state IDs.
+			throw new IllegalStateException("Illegal atomic state ID: " + stateID);
+		}
+	}
+
+	static
+	{
+		IndirectGUIComponentCreator.setComponentSupplier(GUIdlatch.class.getCanonicalName(), (m, p, n) -> new GUIdlatch(m, n));
 	}
 }
\ No newline at end of file