From 5215c6488f032ba21315012516b3886e030a9b2d Mon Sep 17 00:00:00 2001
From: arnaudlabourel <arnaud.labourel@univ-amu.fr>
Date: Thu, 26 Oct 2023 13:57:07 +0200
Subject: [PATCH] corrected bug paint with rectangular cells
---
src/main/java/view/FirefighterGrid.java | 6 ++++--
src/main/resources/view/view.fxml | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/view/FirefighterGrid.java b/src/main/java/view/FirefighterGrid.java
index c1b2274..e754820 100644
--- a/src/main/java/view/FirefighterGrid.java
+++ b/src/main/java/view/FirefighterGrid.java
@@ -69,6 +69,8 @@ public class FirefighterGrid extends Canvas implements Grid<ViewElement>{
this.squareHeight = squareHeight;
this.columnCount = columnCount;
this.rowCount = rowCount;
+ super.setWidth(squareWidth*columnCount);
+ super.setHeight(squareHeight*rowCount);
}
private void paintLines(){
@@ -88,10 +90,10 @@ public class FirefighterGrid extends Canvas implements Grid<ViewElement>{
private void paintSquare(int row, int column, Color color){
getGraphicsContext2D().setFill(color);
- getGraphicsContext2D().fillRect(row*squareHeight,column*squareWidth,squareHeight,squareWidth);
+ getGraphicsContext2D().fillRect(column*squareWidth,row*squareHeight, squareWidth, squareHeight);
}
private void clearSquare(int row, int column){
- getGraphicsContext2D().clearRect(row*squareHeight,column*squareWidth,squareHeight,squareWidth);
+ getGraphicsContext2D().clearRect(column*squareWidth,row*squareHeight, squareWidth, squareHeight);
}
}
\ No newline at end of file
diff --git a/src/main/resources/view/view.fxml b/src/main/resources/view/view.fxml
index 3f19ac9..336ffa3 100644
--- a/src/main/resources/view/view.fxml
+++ b/src/main/resources/view/view.fxml
@@ -33,7 +33,7 @@
mnemonicParsing="false" onAction="#pauseToggleButtonAction" prefHeight="24.0"
prefWidth="200.0" styleClass="button" text="Pause"/>
</VBox>
- <FirefighterGrid fx:id="grid" width="1000.0" height="1000.0"
+ <FirefighterGrid fx:id="grid"
xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml">
</FirefighterGrid>
--
GitLab