projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed logic to core where appropiate
[Mograsim.git]
/
net.mograsim.logic.model
/
src
/
net
/
mograsim
/
logic
/
model
/
SimpleLogicUIStandalone.java
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
2b945b1
..
6a31d47
100644
(file)
--- 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.core.timeline.Timeline;
import net.mograsim.logic.model.model.ViewModelModifiable;
-import net.mograsim.logic.model.modeladapter.
Logic
ModelParameters;
-import net.mograsim.logic.model.modeladapter.
ViewLogicModel
Adapter;
+import net.mograsim.logic.model.modeladapter.
Core
ModelParameters;
+import net.mograsim.logic.model.modeladapter.
LogicCore
Adapter;
public class SimpleLogicUIStandalone
{
public class SimpleLogicUIStandalone
{
@@
-16,26
+16,26
@@
public class SimpleLogicUIStandalone
public static void executeVisualisation(Consumer<ViewModelModifiable> setupViewModel, Consumer<VisualisationObjects> beforeRun)
{
public static void executeVisualisation(Consumer<ViewModelModifiable> setupViewModel, Consumer<VisualisationObjects> beforeRun)
{
-
LogicModelParameters params = new Logic
ModelParameters();
+
CoreModelParameters params = new Core
ModelParameters();
params.gateProcessTime = 50;
params.wireTravelTime = 10;
executeVisualisation(setupViewModel, params, beforeRun);
}
params.gateProcessTime = 50;
params.wireTravelTime = 10;
executeVisualisation(setupViewModel, params, beforeRun);
}
- public static void executeVisualisation(Consumer<ViewModelModifiable> setupViewModel,
Logic
ModelParameters params)
+ public static void executeVisualisation(Consumer<ViewModelModifiable> setupViewModel,
Core
ModelParameters params)
{
executeVisualisation(setupViewModel, params, null);
}
{
executeVisualisation(setupViewModel, params, null);
}
- public static void executeVisualisation(Consumer<ViewModelModifiable> setupViewModel,
Logic
ModelParameters params,
+ public static void executeVisualisation(Consumer<ViewModelModifiable> setupViewModel,
Core
ModelParameters params,
Consumer<VisualisationObjects> beforeRun)
{
// setup view model
ViewModelModifiable viewModel = new ViewModelModifiable();
setupViewModel.accept(viewModel);
Consumer<VisualisationObjects> beforeRun)
{
// setup view model
ViewModelModifiable viewModel = new ViewModelModifiable();
setupViewModel.accept(viewModel);
- // convert to
logic
model
- Timeline timeline =
ViewLogicModel
Adapter.convert(viewModel, params);
+ // convert to
core
model
+ Timeline timeline =
LogicCore
Adapter.convert(viewModel, params);
// initialize UI and executer
LogicUIStandaloneGUI ui = new LogicUIStandaloneGUI(viewModel);
// initialize UI and executer
LogicUIStandaloneGUI ui = new LogicUIStandaloneGUI(viewModel);