diff --git a/src/backend/Simulator.java b/src/backend/Simulator.java index c01f8a5..ca87813 100644 --- a/src/backend/Simulator.java +++ b/src/backend/Simulator.java @@ -178,7 +178,7 @@ public class Simulator extends Thread { */ public void stopSimu() { stopFlag=true; - this.interrupt(); + } public void startSimu() { // same as stopSimu but will set the stopFlag value as false. @@ -450,7 +450,8 @@ public class Simulator extends Thread { public void startSimulation() { if (isWorldEmpty()) { mjf.clicLoadFileButtonCSV("World/baseworld.csv"); - } + } + } diff --git a/src/windowInterface/MyInterface.java b/src/windowInterface/MyInterface.java index a2d4393..0ed4740 100644 --- a/src/windowInterface/MyInterface.java +++ b/src/windowInterface/MyInterface.java @@ -65,7 +65,7 @@ public class MyInterface extends JFrame { }); panelTop.add(btnGo); - JButton btnStop = new JButton("Stop"); + JButton btnStop = new JButton("Reset"); btnStop.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { clicButtonStop(); @@ -199,6 +199,9 @@ public class MyInterface extends JFrame { panelRight.add(clickLabel); clickLabel.setText("click : " + mySimu.clickActionName()); } + + + public void setStepBanner(String s) { stepLabel.setText(s); @@ -237,19 +240,11 @@ public class MyInterface extends JFrame { } public void clicButtonStop() { - //mySimu.stopSimu(); - //update(0); - //instantiateSimu(); - + mySimu.stopSimu(); // Stop the simulation mySimu.reset(); // Reset the simulation state - //panelDraw.repaint(); // Refresh the display - eraseLabels(); // Reset the labels to their initial state - //mySimu.stopSimu(); - - - - + panelDraw.repaint(); // Refresh the display + eraseLabels(); // Reset the labels to their initial state } public void clicButtonToggleClickAction() {