X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2FSimpleLogicUIStandalone.java;h=6a31d474bd757d12efec6d68640855a775cf3bae;hb=552986fd8718d5f2db00802015fdd1ecd58a5a2f;hp=2b945b117727674de728b3c92d1e878ff1c31822;hpb=78136f2ede87e1c22239cff89cbd563d0d1daae6;p=Mograsim.git diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/SimpleLogicUIStandalone.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/SimpleLogicUIStandalone.java index 2b945b11..6a31d474 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/SimpleLogicUIStandalone.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/SimpleLogicUIStandalone.java @@ -4,8 +4,8 @@ import java.util.function.Consumer; import net.mograsim.logic.core.timeline.Timeline; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.modeladapter.LogicModelParameters; -import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; +import net.mograsim.logic.model.modeladapter.CoreModelParameters; +import net.mograsim.logic.model.modeladapter.LogicCoreAdapter; public class SimpleLogicUIStandalone { @@ -16,26 +16,26 @@ public class SimpleLogicUIStandalone public static void executeVisualisation(Consumer setupViewModel, Consumer beforeRun) { - LogicModelParameters params = new LogicModelParameters(); + CoreModelParameters params = new CoreModelParameters(); params.gateProcessTime = 50; params.wireTravelTime = 10; executeVisualisation(setupViewModel, params, beforeRun); } - public static void executeVisualisation(Consumer setupViewModel, LogicModelParameters params) + public static void executeVisualisation(Consumer setupViewModel, CoreModelParameters params) { executeVisualisation(setupViewModel, params, null); } - public static void executeVisualisation(Consumer setupViewModel, LogicModelParameters params, + public static void executeVisualisation(Consumer setupViewModel, CoreModelParameters params, Consumer beforeRun) { // setup view model ViewModelModifiable viewModel = new ViewModelModifiable(); setupViewModel.accept(viewModel); - // convert to logic model - Timeline timeline = ViewLogicModelAdapter.convert(viewModel, params); + // convert to core model + Timeline timeline = LogicCoreAdapter.convert(viewModel, params); // initialize UI and executer LogicUIStandaloneGUI ui = new LogicUIStandaloneGUI(viewModel);