X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Fviews%2FLogicUIPart.java;h=a36ae8ccb167b24d256ad25cd34b1767c6d1edbc;hb=5045f9d777247d015153da1388abba103a08e05c;hp=212f777cdd4b30d833e2a64798d4d21f6ae3909e;hpb=58babf45ae7d259a296656451d796dbe601377a4;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 212f777c..a36ae8cc 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
@@ -4,7 +4,14 @@ import javax.inject.Inject;
 
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseTrackListener;
+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.Label;
+import org.eclipse.swt.widgets.Slider;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.part.ViewPart;
 
@@ -12,8 +19,13 @@ import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasUserInpu
 import net.mograsim.logic.model.LogicExecuter;
 import net.mograsim.logic.model.LogicUICanvas;
 import net.mograsim.machine.Machine;
+import net.mograsim.machine.mi.AssignableMicroInstructionMemory;
+import net.mograsim.plugin.EclipsePreferences;
 import net.mograsim.plugin.MachineContext;
-import net.mograsim.plugin.ThemePreferences;
+import net.mograsim.plugin.MograsimActivator;
+import net.mograsim.plugin.tables.DisplaySettings;
+import net.mograsim.plugin.tables.mi.ActiveInstructionPreviewContentProvider;
+import net.mograsim.plugin.tables.mi.InstructionTable;
 import net.mograsim.preferences.Preferences;
 
 public class LogicUIPart extends ViewPart
@@ -35,11 +47,17 @@ public class LogicUIPart extends ViewPart
 	public void createPartControl(Composite parent)
 	{
 		// set preferences
-		Preferences.setPreferences(new ThemePreferences(PlatformUI.getWorkbench().getThemeManager().getCurrentTheme()));
+		Preferences.setPreferences(new EclipsePreferences(PlatformUI.getWorkbench().getThemeManager().getCurrentTheme(),
+				MograsimActivator.instance().getPreferenceStore()));
 
 		Machine m = MachineContext.getInstance().getMachine();
 
 		// initialize UI
+		GridLayout layout = new GridLayout(1, true);
+		parent.setLayout(layout);
+
+		addSimulationControlWidgets(parent);
+
 		ui = new LogicUICanvas(parent, SWT.NONE, m.getModel());
 		ui.addTransformListener((x, y, z) -> part.setDirty(z < 1));
 		ZoomableCanvasUserInput userInput = new ZoomableCanvasUserInput(ui);
@@ -47,6 +65,20 @@ public class LogicUIPart extends ViewPart
 		userInput.buttonZoom = 2;
 		userInput.enableUserInput();
 
+		GridData uiData = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.FILL_BOTH);
+		ui.setLayoutData(uiData);
+
+		// initialize Instruction preview
+		InstructionTable instPreview = new InstructionTable(parent, new DisplaySettings());
+		instPreview.setContentProvider(new ActiveInstructionPreviewContentProvider(instPreview.getTableViewer()));
+		AssignableMicroInstructionMemory mIMemory = m.getMicroInstructionMemory();
+		instPreview.bindMicroInstructionMemory(mIMemory);
+		mIMemory.registerCellModifiedListener(a -> instPreview.refresh());
+		mIMemory.registerMemoryReassignedListener(n -> instPreview.refresh());
+
+		GridData previewData = new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_HORIZONTAL);
+		instPreview.getTableViewer().getTable().setLayoutData(previewData);
+
 		// initialize executer
 		exec = new LogicExecuter(m.getTimeline());
 
@@ -54,6 +86,94 @@ public class LogicUIPart extends ViewPart
 		exec.startLiveExecution();
 	}
 
+	private void addSimulationControlWidgets(Composite parent)
+	{
+		Composite c = new Composite(parent, SWT.NONE);
+		c.setLayout(new GridLayout(4, false));
+		Button pauseButton = new Button(c, SWT.TOGGLE);
+		pauseButton.setSelection(true);
+		setPauseText(pauseButton, false);
+
+		pauseButton.addListener(SWT.Selection, e ->
+		{
+			setPauseText(pauseButton, false);
+			if (pauseButton.getSelection())
+			{
+				exec.unpauseLiveExecution();
+			} else
+			{
+				exec.pauseLiveExecution();
+			}
+		});
+		pauseButton.addMouseTrackListener(new MouseTrackListener()
+		{
+			@Override
+			public void mouseHover(MouseEvent e)
+			{
+				// nothing
+			}
+
+			@Override
+			public void mouseExit(MouseEvent e)
+			{
+				setPauseText(pauseButton, false);
+			}
+
+			@Override
+			public void mouseEnter(MouseEvent e)
+			{
+				setPauseText(pauseButton, true);
+			}
+		});
+
+		Label speedLabel = new Label(c, SWT.NONE);
+		speedLabel.setText("Simulation Speed: ");
+
+		Slider slider = new Slider(c, SWT.NONE);
+		slider.setMinimum(1);
+		slider.setMaximum(100 + slider.getThumb());
+		slider.setIncrement(1);
+
+		Label speedPercentageLabel = new Label(c, SWT.NONE);
+		speedPercentageLabel.setText("100%");
+
+		slider.addListener(SWT.Selection, e ->
+		{
+			int selection = slider.getSelection();
+			speedPercentageLabel.setText(selection + "%");
+
+			exec.setSpeedPercentage(slider.getSelection());
+		});
+		slider.setSelection(100);
+
+		c.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_HORIZONTAL));
+		c.pack();
+		c.setVisible(true);
+	}
+
+	private void setPauseText(Button pauseButton, boolean hovered)
+	{
+		if (hovered)
+		{
+			if (pauseButton.getSelection())
+			{
+				pauseButton.setText("Pause?");
+			} else
+			{
+				pauseButton.setText("Resume?");
+			}
+		} else
+		{
+			if (pauseButton.getSelection())
+			{
+				pauseButton.setText("Running");
+			} else
+			{
+				pauseButton.setText("Paused");
+			}
+		}
+	}
+
 	@Override
 	public void setFocus()
 	{