From 5367724a2b217b504ced6ed2c576239af7260b2f Mon Sep 17 00:00:00 2001 From: "balthazar.squinabol" Date: Wed, 10 Apr 2024 16:08:43 +0200 Subject: [PATCH 1/6] YES --- src/backend/Simulator.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/backend/Simulator.java b/src/backend/Simulator.java index 41970c4..f8e45bd 100644 --- a/src/backend/Simulator.java +++ b/src/backend/Simulator.java @@ -307,6 +307,14 @@ public class Simulator extends Thread { public void toggleLoopingBorder() { //TODO : complete method + loopingBorder = !loopingBorder; + if (enableLogs) { + if (loopingBorder) { + System.out.println("toggleLoopingBorder called, set loopingBorder to true"); + } else { + System.out.println("toggleLoopingBorder called, set loopingBorder to false"); + } + } } From ff0ad5968cddddb5d81ecbf22c19eefae0f07c91 Mon Sep 17 00:00:00 2001 From: Balthazar SQUINABOL Date: Wed, 10 Apr 2024 16:29:05 +0200 Subject: [PATCH 2/6] Actualiser src/windowInterface/MyInterface.java --- src/windowInterface/MyInterface.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/windowInterface/MyInterface.java b/src/windowInterface/MyInterface.java index f506362..34c46c0 100644 --- a/src/windowInterface/MyInterface.java +++ b/src/windowInterface/MyInterface.java @@ -393,6 +393,7 @@ public class MyInterface extends JFrame { } public void update (int stepCount) { + System.out.println("update called"); this.setStepBanner("Step : "+ stepCount); this.repaint(); } From 3598d99e4f245cd335c536cc9f86a57a58c9dd24 Mon Sep 17 00:00:00 2001 From: Balthazar SQUINABOL Date: Wed, 10 Apr 2024 16:29:32 +0200 Subject: [PATCH 3/6] Actualiser src/backend/Simulator.java --- src/backend/Simulator.java | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/backend/Simulator.java b/src/backend/Simulator.java index f8e45bd..d115462 100644 --- a/src/backend/Simulator.java +++ b/src/backend/Simulator.java @@ -226,19 +226,6 @@ public class Simulator extends Thread { int currentCellValue = getCell(x, y); // set cell value to !currentCellValue } - - public void countAround(int x, int y) { - //enableLogs - //getCell - //if loopingBorder TRUE, border count as living. - if (loopingBorder == true){ - - } - else { - - } - } - /** * @@ -302,7 +289,7 @@ public class Simulator extends Thread { public boolean isLoopingBorder() { //TODO : complete method with proper return - return false; + return loopingBorder; } public void toggleLoopingBorder() { From 2dae9a3251342b4717153eaa335adb8c6503f374 Mon Sep 17 00:00:00 2001 From: Balthazar SQUINABOL Date: Wed, 10 Apr 2024 16:29:57 +0200 Subject: [PATCH 4/6] Actualiser src/backend/Simulator.java --- src/backend/Simulator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/Simulator.java b/src/backend/Simulator.java index d115462..9dc43d2 100644 --- a/src/backend/Simulator.java +++ b/src/backend/Simulator.java @@ -288,12 +288,12 @@ public class Simulator extends Thread { } public boolean isLoopingBorder() { - //TODO : complete method with proper return + //ODO-COMPLETE : complete method with proper return return loopingBorder; } public void toggleLoopingBorder() { - //TODO : complete method + //ODO-COMPLETE : complete method loopingBorder = !loopingBorder; if (enableLogs) { if (loopingBorder) { From 37cdcde4c57f5bc05dea497b646cfad0f9ae38ee Mon Sep 17 00:00:00 2001 From: "balthazar.squinabol" Date: Wed, 10 Apr 2024 16:30:27 +0200 Subject: [PATCH 5/6] s --- src/backend/Simulator.java | 19 +++---------------- src/windowInterface/MyInterface.java | 1 + 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/backend/Simulator.java b/src/backend/Simulator.java index f8e45bd..9dc43d2 100644 --- a/src/backend/Simulator.java +++ b/src/backend/Simulator.java @@ -226,19 +226,6 @@ public class Simulator extends Thread { int currentCellValue = getCell(x, y); // set cell value to !currentCellValue } - - public void countAround(int x, int y) { - //enableLogs - //getCell - //if loopingBorder TRUE, border count as living. - if (loopingBorder == true){ - - } - else { - - } - } - /** * @@ -301,12 +288,12 @@ public class Simulator extends Thread { } public boolean isLoopingBorder() { - //TODO : complete method with proper return - return false; + //ODO-COMPLETE : complete method with proper return + return loopingBorder; } public void toggleLoopingBorder() { - //TODO : complete method + //ODO-COMPLETE : complete method loopingBorder = !loopingBorder; if (enableLogs) { if (loopingBorder) { diff --git a/src/windowInterface/MyInterface.java b/src/windowInterface/MyInterface.java index f506362..34c46c0 100644 --- a/src/windowInterface/MyInterface.java +++ b/src/windowInterface/MyInterface.java @@ -393,6 +393,7 @@ public class MyInterface extends JFrame { } public void update (int stepCount) { + System.out.println("update called"); this.setStepBanner("Step : "+ stepCount); this.repaint(); }