X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Fviews%2FLogicUIPart.java;h=212f777cdd4b30d833e2a64798d4d21f6ae3909e;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=00b1956668aeea308dced630f1bd1705598c5267;hpb=8c26f70ef8444eae412b35805de3fd43fe3ef345;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 00b19566..212f777c 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
@@ -1,9 +1,5 @@
 package net.mograsim.plugin.views;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-
 import javax.inject.Inject;
 
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
@@ -13,18 +9,10 @@ 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.model.LogicExecuter;
 import net.mograsim.logic.model.LogicUICanvas;
-import net.mograsim.logic.model.model.ViewModelModifiable;
-import net.mograsim.logic.model.model.components.GUIComponent;
-import net.mograsim.logic.model.model.components.atomic.GUIBitDisplay;
-import net.mograsim.logic.model.model.components.atomic.GUIManualSwitch;
-import net.mograsim.logic.model.model.wires.GUIWire;
-import net.mograsim.logic.model.model.wires.Pin;
-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.plugin.MachineContext;
 import net.mograsim.plugin.ThemePreferences;
 import net.mograsim.preferences.Preferences;
 
@@ -49,18 +37,10 @@ public class LogicUIPart extends ViewPart
 		// set preferences
 		Preferences.setPreferences(new ThemePreferences(PlatformUI.getWorkbench().getThemeManager().getCurrentTheme()));
 
-		// setup view model
-		ViewModelModifiable viewModel = new ViewModelModifiable();
-		createTestbench(viewModel);
-
-		// convert to logic model
-		LogicModelParameters params = new LogicModelParameters();
-		params.gateProcessTime = 50;
-		params.wireTravelTime = 10;
-		Timeline timeline = ViewLogicModelAdapter.convert(viewModel, params);
+		Machine m = MachineContext.getInstance().getMachine();
 
 		// initialize UI
-		ui = new LogicUICanvas(parent, SWT.NONE, viewModel);
+		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;
@@ -68,7 +48,7 @@ public class LogicUIPart extends ViewPart
 		userInput.enableUserInput();
 
 		// initialize executer
-		exec = new LogicExecuter(timeline);
+		exec = new LogicExecuter(m.getTimeline());
 
 		// run it
 		exec.startLiveExecution();
@@ -79,36 +59,4 @@ public class LogicUIPart extends ViewPart
 	{
 		ui.setFocus();
 	}
-
-	@SuppressWarnings("unused") // for GUIWires being created
-	public static void createTestbench(ViewModelModifiable model)
-	{
-		GUIComponent comp = IndirectGUIComponentCreator.createComponent(model, "GUIAm2901");
-
-		// TODO this code exists four times... but it seems too "hacky" to put it in a helper class
-		List<String> inputPinNames = new ArrayList<>();
-		List<String> outputPinNames = new ArrayList<>();
-		for (Pin p : comp.getPins().values())
-			if (p.getRelX() == 0)
-				inputPinNames.add(p.name);
-			else
-				outputPinNames.add(p.name);
-
-		inputPinNames.sort(Comparator.comparing(comp::getPin, Comparator.comparing(Pin::getRelY)));
-		outputPinNames.sort(Comparator.comparing(comp::getPin, Comparator.comparing(Pin::getRelY)));
-
-		comp.moveTo(100, 0);
-		for (int i = 0; i < inputPinNames.size(); i++)
-		{
-			GUIManualSwitch sw = new GUIManualSwitch(model, 1);
-			sw.moveTo(0, 20 * i);
-			new GUIWire(model, comp.getPin(inputPinNames.get(i)), sw.getOutputPin());
-		}
-		for (int i = 0; i < outputPinNames.size(); i++)
-		{
-			GUIBitDisplay bd = new GUIBitDisplay(model, 1);
-			bd.moveTo(200, 20 * i);
-			new GUIWire(model, comp.getPin(outputPinNames.get(i)), bd.getInputPin());
-		}
-	}
 }
\ No newline at end of file