X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Fviews%2FLogicUIPart.java;h=0b829d58668ab7d524edb375f30ab4cda649ccf6;hb=a712f854c6666e2b42a277485f1fd407cf3e72ef;hp=aab85c8c516c0e9b97717798b06a4e6b61a27ee5;hpb=f14ea37d69488dd51518a36413af7176916b8bd7;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 aab85c8c..0b829d58 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,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;
@@ -7,20 +9,19 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.themes.ITheme;
 
 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;
 
 public class LogicUIPart extends ViewPart
 {
@@ -40,64 +41,37 @@ public class LogicUIPart extends ViewPart
 	@Override
 	public void createPartControl(Composite parent)
 	{
-		// setup view model
-		ViewModelModifiable viewModel = new ViewModelModifiable();
-		createTestbench(viewModel);
+		// set preferences
+		Preferences.setPreferences(new ThemePreferences(PlatformUI.getWorkbench().getThemeManager().getCurrentTheme()));
+
+		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;
 		userInput.buttonZoom = 2;
 		userInput.enableUserInput();
 
-		ITheme currentTheme = PlatformUI.getWorkbench().getThemeManager().getCurrentTheme();
-		update(currentTheme);
-		currentTheme.getColorRegistry().addListener(e -> update(currentTheme));
-
 		// initialize executer
-		exec = new LogicExecuter(timeline);
+		exec = new LogicExecuter(ViewLogicModelAdapter.convert(viewModelModifiable, params));
 
 		// run it
 		exec.startLiveExecution();
 	}
 
-	private void update(ITheme currentTheme)
-	{
-		ui.setBackground(currentTheme.getColorRegistry().get("net.mograsim.plugin.sim_backgound"));
-		ui.setForeground(currentTheme.getColorRegistry().get("net.mograsim.plugin.sim_text_color"));
-	}
-
 	@Override
 	public void setFocus()
 	{
 		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