RessetButton

src/ui/controller/Control.java

@@ -567,7 +567,8 @@ public class Control {
      * to the default "is working" state
      */
     public void resetSimulation() {
-        setIsSimRunning(false);
+      setIsSimRunning(false);
+      simulationManager.resetFlexManager();
     }
 
 

src/ui/controller/SimulationManager.java

@@ -258,7 +258,9 @@ public class SimulationManager {
 	public FlexManager getActualFlexManager() {
 		return savesFlexManger.getOrDefault(timeStep, null);
 	}
-	
+	public void resetFlexManager(){
+		savesFlexManger.clear();
+	}
 	
 	public DecoratedState getDecorState(int timestep) {
 		return saves.getOrDefault(timestep, null);

src/ui/view/GUI.java

@@ -2511,21 +2511,21 @@ public class GUI implements CategoryListener {
 		openMenu.addActionListener(actionEvent -> {
 			new AlgoWindow(holegJFrame, controller);
 		});
-		openMenu.setAccelerator(KeyStroke.getKeyStroke('N', Toolkit.getDefaultToolkit ().getMenuShortcutKeyMaskEx()));
+		openMenu.setAccelerator(KeyStroke.getKeyStroke('N', Toolkit.getDefaultToolkit ().getMenuShortcutKeyMask()));
 		menuWindow.add(openMenu);
 		//Outliner
 		JMenuItem openOutliner =  new JMenuItem("Open Outliner", new ImageIcon(Util.loadImage("/Button_Images/iconOutliner.png").getScaledInstance(20, 20, java.awt.Image.SCALE_SMOOTH)));
 		openOutliner.addActionListener(actionEvent -> {
 			outlinerList.add(new Outliner(holegJFrame, model, controller));
 		});
-		openOutliner.setAccelerator(KeyStroke.getKeyStroke('O', Toolkit.getDefaultToolkit ().getMenuShortcutKeyMaskEx()));
+		openOutliner.setAccelerator(KeyStroke.getKeyStroke('O', Toolkit.getDefaultToolkit ().getMenuShortcutKeyMask()));
 		menuWindow.add(openOutliner);
 		//FlexWindow
 		JMenuItem openFlexMenuItem =  new JMenuItem("Open Flexibility Panel", new ImageIcon(Util.loadImage("/Button_Images/iconAlgo.png").getScaledInstance(20, 20, java.awt.Image.SCALE_SMOOTH)));
 		openFlexMenuItem.addActionListener(actionEvent -> {
 			flexList.add(new FlexWindow(holegJFrame, controller));
 		});
-		openFlexMenuItem.setAccelerator(KeyStroke.getKeyStroke('L', Toolkit.getDefaultToolkit ().getMenuShortcutKeyMaskEx()));
+		openFlexMenuItem.setAccelerator(KeyStroke.getKeyStroke('L', Toolkit.getDefaultToolkit ().getMenuShortcutKeyMask()));
 		menuWindow.add(openFlexMenuItem);
 	}
 

src/ui/view/TimePanel.java

@@ -106,7 +106,6 @@ public class TimePanel extends JPanel implements ActionListener{
 				timeSlider.setValue(timeSlider.getValue() + 1);
 				System.out.println(timeSlider.getValue());
 				int test = timeSlider.getValue();
-				System.out.println(test);
 				controller.setCurIteration(timeSlider.getValue());
 				timer.setDelay(cont.getModel().getTimerSpeed());
 				if (timeSlider.getValue() >= cont.getModel().getIterations() - 1) {
@@ -148,7 +147,7 @@ public class TimePanel extends JPanel implements ActionListener{
 			@Override
 			public void mouseDragged(MouseEvent e) {
 				if (dragResetIteration != cont.getModel().getCurIteration()) {
-					controller.resetSimulation();
+					controller.setIsSimRunning(true);
 					if (running) {
 						playBtn.doClick();
 					}