X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Fviews%2FSimulationView.java;h=0dffceb7cb26b01b0afebf382be92b2de076d10b;hb=e0efed041f09a7ec985a1cd80670711344887472;hp=d1a9041888e3f5ff32cc69451932ae0caf92570e;hpb=278fa8f97a6ba31f3cbdd0c65d370563b943eca9;p=Mograsim.git

diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/views/SimulationView.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/views/SimulationView.java
index d1a90418..0dffceb7 100644
--- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/views/SimulationView.java
+++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/views/SimulationView.java
@@ -1,5 +1,11 @@
 package net.mograsim.plugin.views;
 
+import static net.mograsim.logic.model.preferences.RenderPreferences.DRAG_BUTTON;
+import static net.mograsim.logic.model.preferences.RenderPreferences.ZOOM_BUTTON;
+import static net.mograsim.plugin.preferences.PluginPreferences.SIMULATION_SPEED_PRECISION;
+
+import java.math.BigDecimal;
+import java.math.MathContext;
 import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
@@ -26,16 +32,18 @@ import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasUserInpu
 import net.mograsim.logic.core.LogicObserver;
 import net.mograsim.logic.core.components.CoreClock;
 import net.mograsim.logic.model.LogicUICanvas;
+import net.mograsim.logic.model.modeladapter.CoreModelParameters;
+import net.mograsim.logic.model.preferences.RenderPreferences;
 import net.mograsim.machine.Machine;
 import net.mograsim.machine.Memory.MemoryCellModifiedListener;
 import net.mograsim.machine.mi.AssignableMicroInstructionMemory;
+import net.mograsim.plugin.MograsimActivator;
 import net.mograsim.plugin.launch.MachineDebugContextListener;
 import net.mograsim.plugin.launch.MachineDebugTarget;
 import net.mograsim.plugin.tables.DisplaySettings;
 import net.mograsim.plugin.tables.mi.ActiveInstructionPreviewContentProvider;
 import net.mograsim.plugin.tables.mi.InstructionTable;
 import net.mograsim.plugin.util.OverlappingFillLayout;
-import net.mograsim.preferences.Preferences;
 
 public class SimulationView extends ViewPart
 {
@@ -47,6 +55,7 @@ public class SimulationView extends ViewPart
 	private Button sbseButton;
 	private Scale simSpeedScale;
 	private DoubleInput simSpeedInput;
+	private Label simSpeedDescription;
 	private Composite contextDependentControlsParent;
 	private Composite canvasParent;
 	private InstructionTable instPreview;
@@ -65,7 +74,7 @@ public class SimulationView extends ViewPart
 	{
 		controlsToDisableWhenNoMachinePresent = new HashSet<>();
 		memCellListener = a -> instPreview.refresh();
-		// TODO could this be a breakpoint?
+		// TODO use Step Over instead
 		clockObserver = o ->
 		{
 			if (((CoreClock) o).isOn())
@@ -119,7 +128,7 @@ public class SimulationView extends ViewPart
 	{
 		Composite c = new Composite(parent, SWT.NONE);
 		c.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-		c.setLayout(new GridLayout(7, false));
+		c.setLayout(new GridLayout(8, false));
 
 		sbseButton = new Button(c, SWT.CHECK);
 		controlsToDisableWhenNoMachinePresent.add(sbseButton);
@@ -148,13 +157,13 @@ public class SimulationView extends ViewPart
 		simSpeedScale.addListener(SWT.Selection, e ->
 		{
 			double speed = Math.pow(SIM_SPEED_SCALE_STEP_FACTOR, simSpeedScale.getSelection() - SIM_SPEED_SCALE_STEPS);
-			// TODO: disable when debugTarget is not set
 			debugTarget.setExecutionSpeed(speed);
 		});
 
 		simSpeedInput = new DoubleInput(c, SWT.NONE);
 		controlsToDisableWhenNoMachinePresent.add(simSpeedInput);
-		simSpeedInput.setPrecision(Preferences.current().getInt("net.mograsim.plugin.core.simspeedprecision"));
+		// TODO add a listener
+		simSpeedInput.setPrecision(MograsimActivator.instance().getPluginPrefs().getInt(SIMULATION_SPEED_PRECISION));
 		simSpeedInput.addChangeListener(speed ->
 		{
 			if (speed != 0)
@@ -163,14 +172,43 @@ public class SimulationView extends ViewPart
 				debugTarget.setExecutionSpeed(Math.pow(10, -simSpeedInput.getPrecision()));
 		});
 
+		simSpeedDescription = new Label(c, SWT.NONE);
+		simSpeedDescription.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+
 		c.layout();
 	}
 
+	private String describeSimSpeed(double speed)
+	{
+		CoreModelParameters coreModelParameters = debugTarget.getMachine().getCoreModelParameters();
+		// TODO hardcoding this seems not optimal
+		int ticksPerSecond = 1000000;
+
+		double simulTicksPerRealSecond = speed * ticksPerSecond;
+
+		// TODO internationalize
+		StringBuilder sb = new StringBuilder();
+		sb.append("Per second: ");
+		sb.append(formatNSignificantDigits(4, simulTicksPerRealSecond / coreModelParameters.wireTravelTime));
+		sb.append(" wire travel times; ");
+		sb.append(formatNSignificantDigits(4, simulTicksPerRealSecond / coreModelParameters.gateProcessTime));
+		sb.append(" gate process times; ");
+		sb.append(formatNSignificantDigits(4, simulTicksPerRealSecond / debugTarget.getMachine().getClock().getDelta() / 2));
+		sb.append(" clock cycles");
+		return sb.toString();
+	}
+
+	private static String formatNSignificantDigits(int digits, double d)
+	{
+		return new BigDecimal(d, new MathContext(digits)).toPlainString();
+	}
+
 	private void speedFactorChanged(double speed)
 	{
 		simSpeedInput.setValue(speed);
 		int closestScalePos = (int) Math.round(Math.log(speed) / SIM_SPEED_SCALE_STEP_FACTOR_LOG + SIM_SPEED_SCALE_STEPS);
 		simSpeedScale.setSelection(Math.min(Math.max(closestScalePos, 0), SIM_SPEED_SCALE_STEPS));
+		simSpeedDescription.setText(describeSimSpeed(speed));
 	}
 
 	private void addInstructionPreviewControlWidgets(Composite parent)
@@ -221,11 +259,14 @@ public class SimulationView extends ViewPart
 
 			Machine machine = debugTarget.getMachine();
 
-			canvas = new LogicUICanvas(canvasParent, SWT.NONE, machine.getModel());
+			RenderPreferences renderPrefs = MograsimActivator.instance().getRenderPrefs();
+			canvas = new LogicUICanvas(canvasParent, SWT.NONE, machine.getModel(), renderPrefs);
 			canvas.addListener(SWT.MouseDown, e -> canvas.setFocus());
 			ZoomableCanvasUserInput userInput = new ZoomableCanvasUserInput(canvas);
-			userInput.buttonDrag = Preferences.current().getInt("net.mograsim.logic.model.button.drag");
-			userInput.buttonZoom = Preferences.current().getInt("net.mograsim.logic.model.button.zoom");
+			// TODO add a listener
+			userInput.buttonDrag = renderPrefs.getInt(DRAG_BUTTON);
+			// TODO add a listener
+			userInput.buttonZoom = renderPrefs.getInt(ZOOM_BUTTON);
 			userInput.enableUserInput();
 			if (zoom > 0)
 			{