X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2FSimpleLogicUIStandalone.java;h=20bfcccbb92d465ed1e5b39004b2f66d2429a849;hb=7908fec28b61e5911bf6523a3c10cd3a31dc95e6;hp=03d0335c2f703ad14bcbe4bd982d81904581d4bf;hpb=7d05144c25daa53e60fc9ed9fd503546a86567f8;p=Mograsim.git diff --git a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/SimpleLogicUIStandalone.java b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/SimpleLogicUIStandalone.java index 03d0335c..20bfcccb 100644 --- a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/SimpleLogicUIStandalone.java +++ b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/SimpleLogicUIStandalone.java @@ -5,7 +5,9 @@ import java.util.function.Consumer; import net.mograsim.logic.core.timeline.Timeline; import net.mograsim.logic.model.model.LogicModelModifiable; import net.mograsim.logic.model.modeladapter.CoreModelParameters; +import net.mograsim.logic.model.modeladapter.CoreModelParameters.CoreModelParametersBuilder; import net.mograsim.logic.model.modeladapter.LogicCoreAdapter; +import net.mograsim.logic.model.preferences.DefaultRenderPreferences; public class SimpleLogicUIStandalone { @@ -16,10 +18,11 @@ public class SimpleLogicUIStandalone public static void executeVisualisation(Consumer setupLogicModel, Consumer beforeRun) { - CoreModelParameters params = new CoreModelParameters(); - params.gateProcessTime = 50; - params.wireTravelTime = 10; - executeVisualisation(setupLogicModel, params, beforeRun); + CoreModelParametersBuilder paramsBuilder = CoreModelParameters.builder(); + paramsBuilder.gateProcessTime = 50; + paramsBuilder.hardcodedComponentProcessTime = paramsBuilder.gateProcessTime * 5; + paramsBuilder.wireTravelTime = 10; + executeVisualisation(setupLogicModel, paramsBuilder.build(), beforeRun); } public static void executeVisualisation(Consumer setupLogicModel, CoreModelParameters params) @@ -38,13 +41,14 @@ public class SimpleLogicUIStandalone Timeline timeline = LogicCoreAdapter.convert(logicModel, params); // initialize UI and executer - LogicUIStandaloneGUI ui = new LogicUIStandaloneGUI(logicModel); + LogicUIStandaloneGUI ui = new LogicUIStandaloneGUI(logicModel, new DefaultRenderPreferences()); LogicExecuter exec = new LogicExecuter(timeline); if (beforeRun != null) beforeRun.accept(new VisualisationObjects(logicModel, timeline, ui, exec)); // run it + exec.setSpeedFactor(1); exec.startLiveExecution(); ui.run(); exec.stopLiveExecution();