From 5b0bf11ef46012078eccc4043331a0d058224519 Mon Sep 17 00:00:00 2001 From: Christian Femers Date: Tue, 3 Sep 2019 09:13:41 +0200 Subject: [PATCH] Fixed rough machine implementation --- .../logic/model/am2900/machine/Am2900Machine.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java index df3b726f..0f0dcd51 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java @@ -5,7 +5,6 @@ import net.mograsim.logic.core.timeline.Timeline; import net.mograsim.logic.core.types.BitVector; import net.mograsim.logic.model.model.ViewModel; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.atomic.GUIClock; import net.mograsim.logic.model.modeladapter.LogicModelParameters; import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; @@ -16,20 +15,19 @@ import net.mograsim.machine.Register; public class Am2900Machine implements Machine { private Am2900MachineDefinition machineDefinition; - private ViewModel viewModel; + private ViewModelModifiable viewModel; private Timeline timeline; private Clock clock; public Am2900Machine(Am2900MachineDefinition am2900MachineDefinition) { this.machineDefinition = am2900MachineDefinition; - ViewModelModifiable viewModelModifiable = new ViewModelModifiable(); - IndirectGUIComponentCreator.createComponent(viewModelModifiable, "resource:Am2900Loader:/components/GUIAm2900.json"); + viewModel = new ViewModelModifiable(); + IndirectGUIComponentCreator.createComponent(viewModel, "resource:Am2900Loader:/components/GUIAm2900.json"); LogicModelParameters params = new LogicModelParameters(); params.gateProcessTime = 50; params.wireTravelTime = 10; - timeline = ViewLogicModelAdapter.convert(viewModelModifiable, params); - clock = ((GUIClock) viewModelModifiable.getComponentsByName().get("GUIClock#0")).getClock(); + timeline = ViewLogicModelAdapter.convert(viewModel, params); } @Override -- 2.17.1