Merge branch 'development' of

https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019.git into
development

Conflicts:
	plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java

diff --combined plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java
index b1d0756,cf883d2..736aab3
--- 1/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java
--- 2/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,15 -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;
@@@ -26,6 -23,9 +26,9 @@@ import net.mograsim.machine.mi.Assignab
  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;
@@@ -38,13 -38,13 +41,14 @@@ public class LogicUIPart extends ViewPa
  
        private LogicExecuter exec;
        private LogicUICanvas ui;
 +      private Machine m;
  
        @Override
        public void dispose()
        {
                if (exec != null)
                        exec.stopLiveExecution();
+               super.dispose();
        }
  
        @Override
@@@ -54,7 -54,7 +58,7 @@@
                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);
@@@ -93,42 -93,18 +97,46 @@@
        private void addSimulationControlWidgets(Composite parent)
        {
                Composite c = new Composite(parent, SWT.NONE);
-               c.setLayout(new GridLayout(5, false));
 -              c.setLayout(new GridLayout(6, 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();
@@@ -137,7 -113,6 +145,7 @@@
                                exec.pauseLiveExecution();
                        }
                });
 +
                pauseButton.addMouseTrackListener(new MouseTrackListener()
                {
                        @Override
@@@ -184,7 -159,7 +192,7 @@@
                c.setVisible(true);
        }
  
 -      private void setPauseText(Button pauseButton, boolean hovered)
 +      private static void setPauseText(Button pauseButton, boolean hovered)
        {
                if (hovered)
                {