From 85d66f16790fab1d25a8d0a9e77bf1846f2e3715 Mon Sep 17 00:00:00 2001
From: plojolo <sahbi.lounadi@gmail.com>
Date: Thu, 23 Nov 2023 10:24:58 +0100
Subject: [PATCH] suppression de l'ancienne position des firefighter
---
src/main/java/model/FirefighterBoard.java | 13 ++++++++-----
src/main/java/view/FirefighterGrid.java | 10 +++++-----
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java
index e8989d5..2978c8f 100644
--- a/src/main/java/model/FirefighterBoard.java
+++ b/src/main/java/model/FirefighterBoard.java
@@ -63,6 +63,9 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
public List<Position> updateToNextGeneration() {
+ List<Position> modifiedElements;
+ modifiedElements = fireFighters.firefighterPositions;
+
fireFighters.nextMove();
//System.out.println(fireFighters.firefighterPositions);
@@ -77,13 +80,13 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
fire.nextMove();
step++;
- List<Position> result = new ArrayList<>();
- result.addAll(fire.firePositions);
- result.addAll(fireFighters.firefighterPositions);
- result.addAll(cloud.cloudPositions);
- return result;
+ modifiedElements.addAll(fire.firePositions);
+ modifiedElements.addAll(fireFighters.firefighterPositions);
+ modifiedElements.addAll(cloud.cloudPositions);
+
+ return modifiedElements;
}
@Override
diff --git a/src/main/java/view/FirefighterGrid.java b/src/main/java/view/FirefighterGrid.java
index a4306b3..e1ab0d7 100644
--- a/src/main/java/view/FirefighterGrid.java
+++ b/src/main/java/view/FirefighterGrid.java
@@ -19,18 +19,18 @@ public class FirefighterGrid extends Canvas implements Grid<ViewElement>{
@Override
public void repaint(List<Pair<Position, ViewElement>> positionedElements) {
- clear();
+ clear(positionedElements);
paint(positionedElements);
paintLines();
}
- /*
+
private void clear(List<Pair<Position, ViewElement>> positionedElements) {
for (Pair<Position, ViewElement> positionElement : positionedElements) {
Position position = positionElement.getKey();
clearSquare(position.row(), position.column());
}
}
- */
+
private void paint(List<Pair<Position, ViewElement>> positionedElements) {
for(Pair<Position, ViewElement> pair : positionedElements){
@@ -91,9 +91,9 @@ public class FirefighterGrid extends Canvas implements Grid<ViewElement>{
getGraphicsContext2D().setFill(color);
getGraphicsContext2D().fillRect(row*squareHeight,column*squareWidth,squareHeight,squareWidth);
}
- /*
+
private void clearSquare(int row, int column){
getGraphicsContext2D().clearRect(row*squareHeight,column*squareWidth,squareHeight,squareWidth);
}
- */
+
}
\ No newline at end of file
--
GitLab