X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Fviews%2FLogicUIPart.java;h=736aab3ea0c0c13fbfcd66fbdd5b398612878dc8;hb=4c2b7a2100e55b5e4bf59666b9684d5a996bd0fb;hp=a36ae8ccb167b24d256ad25cd34b1767c6d1edbc;hpb=5045f9d777247d015153da1388abba103a08e05c;p=Mograsim.git

diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java
index a36ae8cc..736aab3e 100644
--- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java
+++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java
@@ -10,12 +10,15 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Slider;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.part.ViewPart;
 
 import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasUserInput;
+import net.mograsim.logic.core.LogicObserver;
+import net.mograsim.logic.core.components.CoreClock;
 import net.mograsim.logic.model.LogicExecuter;
 import net.mograsim.logic.model.LogicUICanvas;
 import net.mograsim.machine.Machine;
@@ -23,6 +26,9 @@ import net.mograsim.machine.mi.AssignableMicroInstructionMemory;
 import net.mograsim.plugin.EclipsePreferences;
 import net.mograsim.plugin.MachineContext;
 import net.mograsim.plugin.MograsimActivator;
+import net.mograsim.plugin.nature.MachineContextSwtTools;
+import net.mograsim.plugin.nature.MachineContextSwtTools.MachineCombo;
+import net.mograsim.plugin.nature.MachineContextSwtTools.MograsimProjectCombo;
 import net.mograsim.plugin.tables.DisplaySettings;
 import net.mograsim.plugin.tables.mi.ActiveInstructionPreviewContentProvider;
 import net.mograsim.plugin.tables.mi.InstructionTable;
@@ -35,12 +41,14 @@ public class LogicUIPart extends ViewPart
 
 	private LogicExecuter exec;
 	private LogicUICanvas ui;
+	private Machine m;
 
 	@Override
 	public void dispose()
 	{
 		if (exec != null)
 			exec.stopLiveExecution();
+		super.dispose();
 	}
 
 	@Override
@@ -50,7 +58,7 @@ public class LogicUIPart extends ViewPart
 		Preferences.setPreferences(new EclipsePreferences(PlatformUI.getWorkbench().getThemeManager().getCurrentTheme(),
 				MograsimActivator.instance().getPreferenceStore()));
 
-		Machine m = MachineContext.getInstance().getMachine();
+		m = MachineContext.getInstance().getMachine();
 
 		// initialize UI
 		GridLayout layout = new GridLayout(1, true);
@@ -89,14 +97,46 @@ public class LogicUIPart extends ViewPart
 	private void addSimulationControlWidgets(Composite parent)
 	{
 		Composite c = new Composite(parent, SWT.NONE);
-		c.setLayout(new GridLayout(4, false));
+		c.setLayout(new GridLayout(7, false));
+
+		MograsimProjectCombo projectCombo = MachineContextSwtTools.createMograsimProjectSelector(c, SWT.NONE);
+		MachineCombo machineCombo = MachineContextSwtTools.createMachineSelector(c, SWT.NONE);
+
+		Button sbseButton = new Button(c, SWT.CHECK);
 		Button pauseButton = new Button(c, SWT.TOGGLE);
+
+		LogicObserver clockObserver = o ->
+		{
+			if (((CoreClock) o).isOn())
+			{
+				exec.pauseLiveExecution();
+				Display.getDefault().asyncExec(() ->
+				{
+					pauseButton.setSelection(false);
+					setPauseText(pauseButton, false);
+				});
+			}
+		};
+
+		sbseButton.addListener(SWT.Selection, e ->
+		{
+			String statusString = "disabled";
+			CoreClock cl = m.getClock();
+			if (sbseButton.getSelection())
+			{
+				cl.registerObserver(clockObserver);
+				statusString = "enabled";
+			} else
+				cl.deregisterObserver(clockObserver);
+			sbseButton.setToolTipText(String.format("Step by step execution: %s", statusString));
+		});
+		sbseButton.setSelection(false);
+
 		pauseButton.setSelection(true);
 		setPauseText(pauseButton, false);
 
 		pauseButton.addListener(SWT.Selection, e ->
 		{
-			setPauseText(pauseButton, false);
 			if (pauseButton.getSelection())
 			{
 				exec.unpauseLiveExecution();
@@ -105,6 +145,7 @@ public class LogicUIPart extends ViewPart
 				exec.pauseLiveExecution();
 			}
 		});
+
 		pauseButton.addMouseTrackListener(new MouseTrackListener()
 		{
 			@Override
@@ -151,7 +192,7 @@ public class LogicUIPart extends ViewPart
 		c.setVisible(true);
 	}
 
-	private void setPauseText(Button pauseButton, boolean hovered)
+	private static void setPauseText(Button pauseButton, boolean hovered)
 	{
 		if (hovered)
 		{