Make plugin work (in an inelegant way, need to figure out extensions

[Mograsim.git] / net.mograsim.plugin.core / src / net / mograsim / plugin / views / LogicUIPart.java

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 1ae8066..0b829d5 100644 (file)
--- a/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java
+++ b/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java
@@ -1,5 +1,7 @@
 package net.mograsim.plugin.views;
 
+import java.util.Optional;
+
 import javax.inject.Inject;
 
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
@@ -9,17 +11,15 @@ import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.part.ViewPart;
 
 import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasUserInput;
-import net.mograsim.logic.core.timeline.Timeline;
-import net.mograsim.logic.ui.LogicExecuter;
-import net.mograsim.logic.ui.LogicUICanvas;
-import net.mograsim.logic.ui.model.ViewModelModifiable;
-import net.mograsim.logic.ui.model.components.GUIBitDisplay;
-import net.mograsim.logic.ui.model.components.GUIManualSwitch;
-import net.mograsim.logic.ui.model.components.SimpleRectangularSubmodelComponent;
-import net.mograsim.logic.ui.model.components.mi.nandbased.am2901.GUIAm2901;
-import net.mograsim.logic.ui.model.wires.GUIWire;
-import net.mograsim.logic.ui.modeladapter.LogicModelParameters;
-import net.mograsim.logic.ui.modeladapter.ViewLogicModelAdapter;
+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.MachineDefinition;
+import net.mograsim.machine.MachineRegistry;
 import net.mograsim.plugin.ThemePreferences;
 import net.mograsim.preferences.Preferences;
 
@@ -44,18 +44,18 @@ public class LogicUIPart extends ViewPart
                // set preferences
                Preferences.setPreferences(new ThemePreferences(PlatformUI.getWorkbench().getThemeManager().getCurrentTheme()));
 
-               // setup view model
-               ViewModelModifiable viewModel = new ViewModelModifiable();
-               createTestbench(viewModel);
+               Optional<MachineDefinition> mdo = MachineRegistry.getinstalledMachines().stream().findFirst();
 
-               // convert to logic model
+               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 timeline = ViewLogicModelAdapter.convert(viewModel, params);
+//             timeline = ;
 
                // initialize UI
-               ui = new LogicUICanvas(parent, SWT.NONE, viewModel);
+               ui = new LogicUICanvas(parent, SWT.NONE, viewModelModifiable);
                ui.addTransformListener((x, y, z) -> part.setDirty(z < 1));
                ZoomableCanvasUserInput userInput = new ZoomableCanvasUserInput(ui);
                userInput.buttonDrag = 3;
@@ -63,7 +63,7 @@ public class LogicUIPart extends ViewPart
                userInput.enableUserInput();
 
                // initialize executer
-               exec = new LogicExecuter(timeline);
+               exec = new LogicExecuter(ViewLogicModelAdapter.convert(viewModelModifiable, params));
 
                // run it
                exec.startLiveExecution();
@@ -74,24 +74,4 @@ public class LogicUIPart extends ViewPart
        {
                ui.setFocus();
        }
-
-       @SuppressWarnings("unused") // for GUIWires being created
-       public static void createTestbench(ViewModelModifiable model)
-       {
-               SimpleRectangularSubmodelComponent comp = new GUIAm2901(model);
-
-               comp.moveTo(100, 0);
-               for (int i = 0; i < comp.getInputPinNames().size(); i++)
-               {
-                       GUIManualSwitch sw = new GUIManualSwitch(model);
-                       sw.moveTo(0, 20 * i);
-                       new GUIWire(model, comp.getPin(comp.getInputPinNames().get(i)), sw.getOutputPin());
-               }
-               for (int i = 0; i < comp.getOutputPinNames().size(); i++)
-               {
-                       GUIBitDisplay bd = new GUIBitDisplay(model);
-                       bd.moveTo(200, 20 * i);
-                       new GUIWire(model, comp.getPin(comp.getOutputPinNames().get(i)), bd.getInputPin());
-               }
-       }
 }
\ No newline at end of file