X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Fviews%2FLogicUIPart.java;h=83b3e2f5566e210870f034514dab4d155dc09817;hb=aacd9de307f43bd19065ace45688a49af064f5a5;hp=0b829d58668ab7d524edb375f30ab4cda649ccf6;hpb=a712f854c6666e2b42a277485f1fd407cf3e72ef;p=Mograsim.git

diff --git a/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java b/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java
index 0b829d58..83b3e2f5 100644
--- a/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java
+++ b/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java
@@ -13,11 +13,7 @@ import org.eclipse.ui.part.ViewPart;
 import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasUserInput;
 import net.mograsim.logic.model.LogicExecuter;
 import net.mograsim.logic.model.LogicUICanvas;
-import net.mograsim.logic.model.am2900.Am2900Loader;
-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.serializing.IndirectGUIComponentCreator;
+import net.mograsim.machine.Machine;
 import net.mograsim.machine.MachineDefinition;
 import net.mograsim.machine.MachineRegistry;
 import net.mograsim.plugin.ThemePreferences;
@@ -46,16 +42,11 @@ public class LogicUIPart extends ViewPart
 
 		Optional<MachineDefinition> mdo = MachineRegistry.getinstalledMachines().stream().findFirst();
 
-		Am2900Loader.setup();
-		ViewModelModifiable viewModelModifiable = new ViewModelModifiable();
-		IndirectGUIComponentCreator.createComponent(viewModelModifiable, "resource:Am2900Loader:/components/GUIAm2900.json");
-		LogicModelParameters params = new LogicModelParameters();
-		params.gateProcessTime = 50;
-		params.wireTravelTime = 10;
-//		timeline = ;
+		MachineDefinition md = mdo.orElseThrow(IllegalStateException::new);
+		Machine m = md.createNew();
 
 		// initialize UI
-		ui = new LogicUICanvas(parent, SWT.NONE, viewModelModifiable);
+		ui = new LogicUICanvas(parent, SWT.NONE, m.getModel());
 		ui.addTransformListener((x, y, z) -> part.setDirty(z < 1));
 		ZoomableCanvasUserInput userInput = new ZoomableCanvasUserInput(ui);
 		userInput.buttonDrag = 3;
@@ -63,7 +54,7 @@ public class LogicUIPart extends ViewPart
 		userInput.enableUserInput();
 
 		// initialize executer
-		exec = new LogicExecuter(ViewLogicModelAdapter.convert(viewModelModifiable, params));
+		exec = new LogicExecuter(m.getTimeline());
 
 		// run it
 		exec.startLiveExecution();