X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Feditors%2FSimulationViewEditor.java;h=06fadc001fc880876b2867bf7f3aa0925e5e2440;hb=59e4f0d9447e3c764c83e7edabfcbf5c3c24a97b;hp=3ed2128104a28604947a372553541147b1fcdefa;hpb=ac731eacea5fcad24af81466a46855f5d8e29f69;p=Mograsim.git

diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/editors/SimulationViewEditor.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/editors/SimulationViewEditor.java
index 3ed21281..06fadc00 100644
--- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/editors/SimulationViewEditor.java
+++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/editors/SimulationViewEditor.java
@@ -49,8 +49,10 @@ public class SimulationViewEditor extends EditorPart
 	private Machine machine;
 
 	private Composite parent;
+	private Button resetButton;
 	private Button sbseButton;
 	private Button pauseButton;
+	private Label speedFactorLabel;
 	private Slider simSpeedSlider;
 	private Composite canvasParent;
 	private LogicUICanvas canvas;
@@ -125,6 +127,7 @@ public class SimulationViewEditor extends EditorPart
 		if (context != null && (machineOptional = context.getActiveMachine()).isPresent())
 		{
 			noMachineLabel.setVisible(false);
+			resetButton.setEnabled(true);
 			sbseButton.setEnabled(true);
 			pauseButton.setEnabled(true);
 			simSpeedSlider.setEnabled(true);
@@ -149,10 +152,13 @@ public class SimulationViewEditor extends EditorPart
 
 			// initialize executer
 			exec = new LogicExecuter(machine.getTimeline());
+			updateSpeedFactor();
+			updatePausedState();
 			exec.startLiveExecution();
 		} else
 		{
 			noMachineLabel.setVisible(true);
+			resetButton.setEnabled(false);
 			sbseButton.setEnabled(false);
 			pauseButton.setEnabled(false);
 			simSpeedSlider.setEnabled(false);
@@ -173,8 +179,13 @@ public class SimulationViewEditor extends EditorPart
 	private void addSimulationControlWidgets(Composite parent)
 	{
 		Composite c = new Composite(parent, SWT.NONE);
+		c.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 		c.setLayout(new GridLayout(7, false));
 
+		resetButton = new Button(c, SWT.PUSH);
+		resetButton.setText("Reset machine");
+		resetButton.addListener(SWT.Selection, e -> context.getActiveMachine().get().reset());
+
 		sbseButton = new Button(c, SWT.CHECK);
 		pauseButton = new Button(c, SWT.TOGGLE);
 
@@ -192,17 +203,7 @@ public class SimulationViewEditor extends EditorPart
 		pauseButton.setSelection(true);
 		setPauseText(pauseButton, false);
 
-		pauseButton.addListener(SWT.Selection, e ->
-		{
-			setPauseText(pauseButton, false);
-			if (pauseButton.getSelection())
-			{
-				exec.unpauseLiveExecution();
-			} else
-			{
-				exec.pauseLiveExecution();
-			}
-		});
+		pauseButton.addListener(SWT.Selection, e -> updatePausedState());
 		pauseButton.addMouseTrackListener(new MouseTrackListener()
 		{
 			@Override
@@ -224,28 +225,39 @@ public class SimulationViewEditor extends EditorPart
 			}
 		});
 
-		Label speedLabel = new Label(c, SWT.NONE);
-		speedLabel.setText("Simulation Speed: ");
+		new Label(c, SWT.NONE).setText("Simulation Speed: ");
 
 		simSpeedSlider = new Slider(c, SWT.NONE);
-		simSpeedSlider.setMinimum(1);
-		simSpeedSlider.setMaximum(100 + simSpeedSlider.getThumb());
+		simSpeedSlider.setMinimum(0);
+		simSpeedSlider.setMaximum(50 + simSpeedSlider.getThumb());
 		simSpeedSlider.setIncrement(1);
+		simSpeedSlider.setSelection(0);
 
-		Label speedPercentageLabel = new Label(c, SWT.NONE);
-		speedPercentageLabel.setText("100%");
+		speedFactorLabel = new Label(c, SWT.NONE);
+		speedFactorLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 
-		simSpeedSlider.addListener(SWT.Selection, e ->
-		{
-			int selection = simSpeedSlider.getSelection();
-			speedPercentageLabel.setText(selection + "%");
+		simSpeedSlider.addListener(SWT.Selection, e -> updateSpeedFactor());
+		updateSpeedFactor();
 
-			exec.setSpeedPercentage(simSpeedSlider.getSelection());
-		});
-		simSpeedSlider.setSelection(100);
+		c.layout();
+	}
 
-		c.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_HORIZONTAL));
-		c.pack();
+	private void updatePausedState()
+	{
+		setPauseText(pauseButton, false);
+		if (exec != null)
+			if (pauseButton.getSelection())
+				exec.unpauseLiveExecution();
+			else
+				exec.pauseLiveExecution();
+	}
+
+	private void updateSpeedFactor()
+	{
+		double factor = Math.pow(1.32, simSpeedSlider.getSelection() - 50);
+		speedFactorLabel.setText(String.format("%f", factor));
+		if (exec != null)
+			exec.setSpeedFactor(factor);
 	}
 
 	private void addInstructionPreviewControlWidgets(Composite parent)