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=3999966d0022a02835c9cb87b57bf698da428799;hb=45941345b94530390abe953aab4e78135d4f0742;hp=a09de95bcf4b1ea86e66cf1faef6b0dd71e6097c;hpb=21ffb2a7f764069fb3c55b71647b43e8803e668c;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..3999966d 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,6 +6,7 @@ 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.am2900.Am2900Loader; import net.mograsim.logic.model.model.ViewModelModifiable; import net.mograsim.logic.model.model.components.atomic.GUIManualSwitch; import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; @@ -18,20 +19,20 @@ public class Am2904Testbench { public static void main(String[] args) { + Am2900Loader.setup(); SimpleLogicUIStandalone.executeVisualisation(Am2904Testbench::create, Am2904Testbench::beforeRun); } public static void create(ViewModelModifiable model) { - // TODO use _SE in GUIAm2904.json // TODO replace with proper ViewModel deserialization DeserializedSubmodelComponent testbench = (DeserializedSubmodelComponent) IndirectGUIComponentCreator.createComponent(model, - "file:GUIAm2904Testbench.json", "testbench"); + "jsonfile:GUIAm2904Testbench.json", "testbench"); testbench.setSize(1000, 1000); testbench.setOutlineRenderer(new Renderer() { @Override - public Object getParamsForSerializing(IdentifierGetter idGetter) + public Void getParamsForSerializing(IdentifierGetter idGetter) { return null; }