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=3eb713f4790896fbb3b71028a03b946a3d12dbd0;hp=49c6fa435ee1396034ea17a190345bca1c7f3cb7;hpb=41292b984ee229deb329c83b525006fd2840becb;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 49c6fa43..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 @@ -4,13 +4,21 @@ 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.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; @@ -18,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; @@ -30,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 @@ -45,12 +58,14 @@ 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); 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); @@ -79,6 +94,127 @@ public class LogicUIPart extends ViewPart exec.startLiveExecution(); } + private void addSimulationControlWidgets(Composite parent) + { + Composite c = new Composite(parent, SWT.NONE); + 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 -> + { + 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 static 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() {