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%2FGUIdlatch4.java;h=388c454520b57925d85bee6ae238ad880470772d;hb=5ece0acf049bf9af2933f513fe0206565681f622;hp=61a239a2193493cc96867b09289f56d6ca77fb49;hpb=c2ba1e811b4ebd9e14377e25fadaf5774a28830e;p=Mograsim.git

diff --git a/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdlatch4.java b/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdlatch4.java
index 61a239a2..388c4545 100644
--- a/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdlatch4.java
+++ b/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdlatch4.java
@@ -4,10 +4,11 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 import net.mograsim.logic.core.types.Bit;
 import net.mograsim.logic.core.types.BitVector;
 import net.mograsim.logic.ui.model.ViewModelModifiable;
-import net.mograsim.logic.ui.model.components.SimpleRectangularSubmodelComponent;
+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 GUIdlatch4 extends SimpleRectangularSubmodelComponent
 {
@@ -18,7 +19,12 @@ public class GUIdlatch4 extends SimpleRectangularSubmodelComponent
 
 	public GUIdlatch4(ViewModelModifiable model)
 	{
-		super(model, 1, "GUIdlatch4");
+		this(model, null);
+	}
+
+	public GUIdlatch4(ViewModelModifiable model, String name)
+	{
+		super(model, 1, "GUIdlatch4", name);
 		setSubmodelScale(.4);
 		setInputPins("D1", "D2", "D3", "D4", "C");
 		setOutputPins("Q1", "Q2", "Q3", "Q4");
@@ -70,10 +76,16 @@ public class GUIdlatch4 extends SimpleRectangularSubmodelComponent
 		new GUIWire(submodelModifiable, dlatch2.getPin("Q"), Q2, new Point[0]);
 		new GUIWire(submodelModifiable, dlatch3.getPin("Q"), Q3, new Point[0]);
 		new GUIWire(submodelModifiable, dlatch4.getPin("Q"), Q4, new Point[0]);
+
+		addAtomicHighLevelStateID("q1");
+		addAtomicHighLevelStateID("q2");
+		addAtomicHighLevelStateID("q3");
+		addAtomicHighLevelStateID("q4");
+		addAtomicHighLevelStateID("q");
 	}
 
 	@Override
-	public void setHighLevelState(String stateID, Object newState)
+	public void setAtomicHighLevelState(String stateID, Object newState)
 	{
 		switch (stateID)
 		{
@@ -91,19 +103,19 @@ public class GUIdlatch4 extends SimpleRectangularSubmodelComponent
 			break;
 		case "q":
 			BitVector newStateCasted = (BitVector) newState;
-			setHighLevelState("q1", newStateCasted.getBit(3));
-			setHighLevelState("q2", newStateCasted.getBit(2));
-			setHighLevelState("q3", newStateCasted.getBit(1));
-			setHighLevelState("q4", newStateCasted.getBit(0));
+			setHighLevelState("q1", newStateCasted.getBit(0));
+			setHighLevelState("q2", newStateCasted.getBit(1));
+			setHighLevelState("q3", newStateCasted.getBit(2));
+			setHighLevelState("q4", newStateCasted.getBit(3));
 			break;
 		default:
-			super.setHighLevelState(stateID, newState);
-			break;
+			// should not happen because we tell SubmodelComponent to only allow these state IDs.
+			throw new IllegalStateException("Illegal atomic state ID: " + stateID);
 		}
 	}
 
 	@Override
-	public Object getHighLevelState(String stateID)
+	public Object getAtomicHighLevelState(String stateID)
 	{
 		switch (stateID)
 		{
@@ -120,9 +132,15 @@ public class GUIdlatch4 extends SimpleRectangularSubmodelComponent
 			Bit q2 = (Bit) getHighLevelState("q2");
 			Bit q3 = (Bit) getHighLevelState("q3");
 			Bit q4 = (Bit) getHighLevelState("q4");
-			return BitVector.of(q4, q3, q2, q1);
+			return BitVector.of(q1, q2, q3, q4);
 		default:
-			return super.getHighLevelState(stateID);
+			// should not happen because we tell SubmodelComponent to only allow these state IDs.
+			throw new IllegalStateException("Illegal atomic state ID: " + stateID);
 		}
 	}
+
+	static
+	{
+		IndirectGUIComponentCreator.setComponentSupplier(GUIdlatch4.class.getCanonicalName(), (m, p, n) -> new GUIdlatch4(m, n));
+	}
 }
\ No newline at end of file