X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Ftest%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fam2904%2FAm2904Testbench.java;h=e46561d57b4cce2081ccfffb13dd73faa2d48347;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=a09de95bcf4b1ea86e66cf1faef6b0dd71e6097c;hpb=500d5825bb557014eed80819f59a58b43ff71b05;p=Mograsim.git

diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/Am2904Testbench.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/Am2904Testbench.java
index a09de95b..e46561d5 100644
--- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/Am2904Testbench.java
+++ b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/Am2904Testbench.java
@@ -6,32 +6,39 @@ import net.mograsim.logic.core.types.Bit;
 import net.mograsim.logic.core.types.BitVector;
 import net.mograsim.logic.model.SimpleLogicUIStandalone;
 import net.mograsim.logic.model.SimpleLogicUIStandalone.VisualisationObjects;
-import net.mograsim.logic.model.model.ViewModelModifiable;
-import net.mograsim.logic.model.model.components.atomic.GUIManualSwitch;
+import net.mograsim.logic.model.am2900.Am2900Loader;
+import net.mograsim.logic.model.model.LogicModelModifiable;
+import net.mograsim.logic.model.model.components.atomic.ModelManualSwitch;
 import net.mograsim.logic.model.model.components.submodels.SubmodelComponent;
 import net.mograsim.logic.model.serializing.DeserializedSubmodelComponent;
-import net.mograsim.logic.model.serializing.IdentifierGetter;
-import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
+import net.mograsim.logic.model.serializing.IdentifyParams;
+import net.mograsim.logic.model.serializing.IndirectModelComponentCreator;
 import net.mograsim.logic.model.snippets.Renderer;
 
 public class Am2904Testbench
 {
 	public static void main(String[] args)
 	{
+		Am2900Loader.setup();
 		SimpleLogicUIStandalone.executeVisualisation(Am2904Testbench::create, Am2904Testbench::beforeRun);
 	}
 
-	public static void create(ViewModelModifiable model)
+	public static void create(LogicModelModifiable model)
 	{
-		// TODO use _SE in GUIAm2904.json
-		// TODO replace with proper ViewModel deserialization
-		DeserializedSubmodelComponent testbench = (DeserializedSubmodelComponent) IndirectGUIComponentCreator.createComponent(model,
-				"file:GUIAm2904Testbench.json", "testbench");
+		// TODO replace with proper LogicModel deserialization
+		DeserializedSubmodelComponent testbench = (DeserializedSubmodelComponent) IndirectModelComponentCreator.createComponent(model,
+				"jsonfile:Am2904Testbench.json", "testbench");
 		testbench.setSize(1000, 1000);
 		testbench.setOutlineRenderer(new Renderer()
 		{
 			@Override
-			public Object getParamsForSerializing(IdentifierGetter idGetter)
+			public String getIDForSerializing(IdentifyParams idParams)
+			{
+				return null;
+			}
+
+			@Override
+			public Void getParamsForSerializing(IdentifyParams idParams)
 			{
 				return null;
 			}
@@ -48,9 +55,9 @@ public class Am2904Testbench
 	{
 		((SubmodelComponent) vis.model.getComponentsByName().get("testbench")).submodel.getComponentsByName().values().forEach(c ->
 		{
-			if (c instanceof GUIManualSwitch)
+			if (c instanceof ModelManualSwitch)
 			{
-				GUIManualSwitch cCasted = (GUIManualSwitch) c;
+				ModelManualSwitch cCasted = (ModelManualSwitch) c;
 				cCasted.setHighLevelState("out", BitVector.of(Bit.ZERO, cCasted.logicWidth));
 			}
 		});