Merge branch 'master' of
https://gitarero.ecam.fr/raphael.savio/OOP_E4_Project.git
This commit is contained in:
commit
a60c16d748
|
|
@ -137,7 +137,11 @@ public class Simulator extends Thread {
|
||||||
*/
|
*/
|
||||||
public void togglePause() {
|
public void togglePause() {
|
||||||
// TODO : actually toggle the corresponding flag
|
// TODO : actually toggle the corresponding flag
|
||||||
}
|
pauseFlag=!pauseFlag;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* method called when clicking on a cell in the interface
|
* method called when clicking on a cell in the interface
|
||||||
|
|
@ -258,16 +262,32 @@ public class Simulator extends Thread {
|
||||||
|
|
||||||
public void toggleLoopingBorder() {
|
public void toggleLoopingBorder() {
|
||||||
//TODO : complete method
|
//TODO : complete method
|
||||||
|
loopingBorder = !loopingBorder;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setLoopDelay(int delay) {
|
public void setLoopDelay(int delay) {
|
||||||
//TODO : complete method
|
//TODO : complete method
|
||||||
|
<<<<<<< HEAD
|
||||||
loopDelay=delay;
|
loopDelay=delay;
|
||||||
|
=======
|
||||||
|
// this.loopDelay = delay;
|
||||||
|
// if (pauseFlag) {
|
||||||
|
// return;
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// try {
|
||||||
|
// Thread.sleep(loopDelay);
|
||||||
|
// } catch (InterruptedException e) {
|
||||||
|
// Thread.currentThread().interrupt(); // Restore interrupted status.
|
||||||
|
// System.err.println("Simulation step was interrupted.");
|
||||||
|
// }
|
||||||
|
>>>>>>> branch 'master' of https://gitarero.ecam.fr/raphael.savio/OOP_E4_Project.git
|
||||||
}
|
}
|
||||||
|
|
||||||
public void toggleClickAction() {
|
public void toggleClickAction() {
|
||||||
//TODO : complete method
|
//TODO : complete method
|
||||||
|
clickActionFlag = !clickActionFlag;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue