diff --git a/.gradle/8.4/executionHistory/executionHistory.bin b/.gradle/8.4/executionHistory/executionHistory.bin
index 64e9d0d5e11faf525fab9eeae4ca9da2991455d2..dfc9b9a643a433dbcbfa8a9f0a1e19682da1751f 100644
Binary files a/.gradle/8.4/executionHistory/executionHistory.bin and b/.gradle/8.4/executionHistory/executionHistory.bin differ
diff --git a/.gradle/8.4/executionHistory/executionHistory.lock b/.gradle/8.4/executionHistory/executionHistory.lock
index 99a195149b28702e58c93e37c0092822ea24d263..1ec20ce152e122898a8f0cfa1b737538191a9a5b 100644
Binary files a/.gradle/8.4/executionHistory/executionHistory.lock and b/.gradle/8.4/executionHistory/executionHistory.lock differ
diff --git a/.gradle/8.4/fileHashes/fileHashes.bin b/.gradle/8.4/fileHashes/fileHashes.bin
index 3355ee12daf45d237e3974561b8cf6e998a36846..dd65f6d0fed25854234b4839bae748effb932415 100644
Binary files a/.gradle/8.4/fileHashes/fileHashes.bin and b/.gradle/8.4/fileHashes/fileHashes.bin differ
diff --git a/.gradle/8.4/fileHashes/fileHashes.lock b/.gradle/8.4/fileHashes/fileHashes.lock
index 9c9daee5f0c86f5436dbe194bdf0e3f414568967..e198dd852dc928d6de49961000ffc8892ddb2f7a 100644
Binary files a/.gradle/8.4/fileHashes/fileHashes.lock and b/.gradle/8.4/fileHashes/fileHashes.lock differ
diff --git a/.gradle/8.4/fileHashes/resourceHashesCache.bin b/.gradle/8.4/fileHashes/resourceHashesCache.bin
index e1b12e26c357a0f634638d4d54082f19443ac41f..c5fecb62978f5cd4334d5f6d32924227dce00bef 100644
Binary files a/.gradle/8.4/fileHashes/resourceHashesCache.bin and b/.gradle/8.4/fileHashes/resourceHashesCache.bin differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index d6ffe09f0317f288e61b0c65d30d0b1374650a8c..61e6c3419fe447590c0d73601b71061d757ce4f4 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/build/classes/java/main/app/SimulatorApplication.class b/build/classes/java/main/app/SimulatorApplication.class
index e22893fb61ab612c2f32bf3e28cfd940545fa96f..710b7e449b80cc57d3fca16a1745b5d38726aa73 100644
Binary files a/build/classes/java/main/app/SimulatorApplication.class and b/build/classes/java/main/app/SimulatorApplication.class differ
diff --git a/build/classes/java/main/controller/controllerMenu.class b/build/classes/java/main/controller/controllerMenu.class
index ab696f6c396ca7dcad7029c2f7e94c82303accd9..fd31aa52aeca2374a6f1a254a989e8268280da1d 100644
Binary files a/build/classes/java/main/controller/controllerMenu.class and b/build/classes/java/main/controller/controllerMenu.class differ
diff --git a/build/classes/java/main/model/Element/FireFigther.class b/build/classes/java/main/model/Element/FireFigther.class
index 66895a0bc95edde0012dde9ed1fffdfd601e0067..488fe0b1c5ca7bcab07395467dea8e9b75123eee 100644
Binary files a/build/classes/java/main/model/Element/FireFigther.class and b/build/classes/java/main/model/Element/FireFigther.class differ
diff --git a/build/classes/java/main/model/Element/MotorisedFirefigther.class b/build/classes/java/main/model/Element/MotorisedFirefigther.class
index 693a8899177c34589a4726a21e97593178078ef9..3262e60a8ebcd67ee4a50657e87ac010e973afe3 100644
Binary files a/build/classes/java/main/model/Element/MotorisedFirefigther.class and b/build/classes/java/main/model/Element/MotorisedFirefigther.class differ
diff --git a/build/classes/java/main/model/FirefighterBoard.class b/build/classes/java/main/model/FirefighterBoard.class
index 0221dd6af6afbf4b7fdb9a91c10ec2f82c2bf860..22c5e7237e4ea669a27d68a9ab99bb1dd1ffa5f4 100644
Binary files a/build/classes/java/main/model/FirefighterBoard.class and b/build/classes/java/main/model/FirefighterBoard.class differ
diff --git a/build/classes/java/main/util/Tools.class b/build/classes/java/main/util/Tools.class
index dfd4de5c64c025ce375e86a3597ca38b28692826..2b7917e4391a529edd908c3678aeee42d9ab370c 100644
Binary files a/build/classes/java/main/util/Tools.class and b/build/classes/java/main/util/Tools.class differ
diff --git a/build/classes/java/main/view/ViewElement.class b/build/classes/java/main/view/ViewElement.class
index 6a770ed265853e93f7262f61f4f47112d408c139..e00edaf4316d1923be8ab8de0b5f1c7994dd5d2c 100644
Binary files a/build/classes/java/main/view/ViewElement.class and b/build/classes/java/main/view/ViewElement.class differ
diff --git a/build/resources/main/view/fireFigtherView/putElementCount.fxml b/build/resources/main/view/fireFigtherView/putElementCount.fxml
index cfcfede0722667a83822f499e579b6775d677f01..3d8003d6466fe273c17056ff7be7d0abc7d6f623 100644
--- a/build/resources/main/view/fireFigtherView/putElementCount.fxml
+++ b/build/resources/main/view/fireFigtherView/putElementCount.fxml
@@ -1,12 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.*?>
+<?import javafx.scene.image.*?>
<?import javafx.scene.layout.*?>
-<AnchorPane fx:id="Fire" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1">
+<AnchorPane fx:id="putElementCount" fx:controller="controller.fireFigther.ControllerPutElementCountController" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="434.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1">
<children>
- <Spinner fx:id="fire" editable="true" layoutX="111.0" layoutY="67.0" prefHeight="25.0" prefWidth="363.0" />
- <Label layoutX="111.0" layoutY="50.0" text="Fire" />
- <Label layoutX="111.0" layoutY="103.0" text="Fire Fighter" />
+ <Spinner fx:id="fire" editable="true" layoutX="106.0" layoutY="31.0" prefHeight="25.0" prefWidth="363.0" value="10" min="1" max="100" />
+ <Label layoutX="265.0" layoutY="14.0" text="Fire" />
+ <Label layoutX="245.0" layoutY="64.0" text="Fire Fighter" />
+ <Spinner fx:id="firefighter" layoutX="106.0" layoutY="82.0" prefHeight="25.0" prefWidth="363.0" value="10" min="1" max="100"/>
+ <Spinner fx:id="Cloud" layoutX="102.0" layoutY="134.0" prefHeight="25.0" prefWidth="363.0" value="10" min="1" max="100" />
+ <Spinner fx:id="MotorisedFireFighter" layoutX="106.0" layoutY="186.0" prefHeight="25.0" prefWidth="363.0" value="10" min="1" max="100" />
+ <Spinner fx:id="Mountain" layoutX="102.0" layoutY="234.0" prefHeight="25.0" prefWidth="363.0" value="10" min="1" max="100"/>
+ <Spinner fx:id="Road" layoutX="101.0" layoutY="286.0" prefHeight="25.0" prefWidth="355.0" value="10" min="1" max="100"/>
+ <Spinner fx:id="Rockerie" layoutX="100.0" layoutY="335.0" prefHeight="25.0" prefWidth="355.0" value="10" min="1" max="100"/>
+ <Button layoutX="229.0" layoutY="376.0" mnemonicParsing="false" prefHeight="55.0" prefWidth="92.0" text="Button" />
+ <Label layoutX="259.0" layoutY="116.0" text="Cloud" />
+ <Label layoutX="215.0" layoutY="169.0" text="Motorised Fire Fighter" />
+ <Label layoutX="249.0" layoutY="217.0" text="Mountain" />
+ <Label layoutX="260.0" layoutY="269.0" text="Road" />
+ <Label layoutX="251.0" layoutY="318.0" text="Rockerie" />
+ <ImageView fitHeight="62.0" fitWidth="102.0" layoutX="223.0" layoutY="373.0" pickOnBounds="true" preserveRatio="true" />
</children>
</AnchorPane>
diff --git a/build/resources/main/view/menu.fxml b/build/resources/main/view/menu.fxml
index 40c574685ad41b34e7799f3582f66b2fadeaf54b..e974135e404bb15ad97b487aec3080719a8f7dc3 100644
--- a/build/resources/main/view/menu.fxml
+++ b/build/resources/main/view/menu.fxml
@@ -3,13 +3,11 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
-
<AnchorPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="controller.controllerMenu">
<children>
- <Button layoutX="36.0" layoutY="119.0" mnemonicParsing="false" prefHeight="106.0" prefWidth="259.0" text="firefiter" />
- <Button layoutX="321.0" layoutY="119.0" mnemonicParsing="false" prefHeight="106.0" prefWidth="259.0" text="virus" />
- <Button layoutX="193.0" layoutY="279.0" mnemonicParsing="false" prefHeight="56.0" prefWidth="231.0" text="play" />
- <Button layoutX="541.0" layoutY="14.0" mnemonicParsing="false" prefHeight="41.0" prefWidth="45.0" text="setting" />
- <Button layoutX="14.0" layoutY="14.0" mnemonicParsing="false" prefHeight="35.0" prefWidth="96.0" text="exit" />
+ <Button fx:id="FireFighter" layoutX="36.0" layoutY="119.0" mnemonicParsing="false" onAction="#FireFighter" prefHeight="106.0" prefWidth="259.0" text="firefiter" />
+ <Button fx:id="Virus" layoutX="321.0" layoutY="119.0" mnemonicParsing="false" onAction="#Virus" prefHeight="106.0" prefWidth="259.0" text="virus" />
+ <Button fx:id="Settings" layoutX="541.0" layoutY="14.0" mnemonicParsing="false" onAction="#Settings" prefHeight="41.0" prefWidth="45.0" text="setting" />
+ <Button layoutX="14.0" layoutY="14.0" mnemonicParsing="false" onAction="#exit" prefHeight="35.0" prefWidth="96.0" text="exit" />
</children>
</AnchorPane>
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/SimulatorApplication.class.uniqueId0 b/build/tmp/compileJava/compileTransaction/stash-dir/SimulatorApplication.class.uniqueId0
index 44358f3c84267da03fa9cee5179f4da994c8ad65..02eeb3e821f208fd2b9cbe4d4646b91a56797c8d 100644
Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/SimulatorApplication.class.uniqueId0 and b/build/tmp/compileJava/compileTransaction/stash-dir/SimulatorApplication.class.uniqueId0 differ
diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
index 0ea7282b4ee84c8f1c55f66a62091819551832de..ab4a0b354f0b1a23303e9e7c7c7fb55f0a335394 100644
Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ
diff --git a/src/main/java/app/SimulatorApplication.java b/src/main/java/app/SimulatorApplication.java
index 85238c00306a419ab825a44b0b7cab45a0980730..9ff1a94dd60cecea170ff69707c0a32cb35c7948 100644
--- a/src/main/java/app/SimulatorApplication.java
+++ b/src/main/java/app/SimulatorApplication.java
@@ -14,13 +14,13 @@ import java.net.URL;
import java.util.Map;
public class SimulatorApplication extends javafx.application.Application {
- private static final String VIEW_RESOURCE_PATH = "/view/fireFigtherView/putElementCount.fxml";
+ private static final String VIEW_RESOURCE_PATH = "/view/fireFigtherView/fireFigtherBord.fxml";
private static final String APP_NAME = "Firefighter simulator";
private static final int ROW_COUNT = 20;
private static final int COLUMN_COUNT = 20;
- private static final int SQUARE_WIDTH = 30;
- private static final int SQUARE_HEIGHT = 30;
+ private static final int SQUARE_WIDTH = 40;
+ private static final int SQUARE_HEIGHT = 40;
private Map<ModelElement,Integer> INITIAL_ELEMENTS_COUNT;
@@ -44,13 +44,13 @@ public class SimulatorApplication extends javafx.application.Application {
}
private void initializeInitialElementCount() {
INITIAL_ELEMENTS_COUNT = new HashMap<>();
- INITIAL_ELEMENTS_COUNT.put(new Fire(), 1);
- INITIAL_ELEMENTS_COUNT.put(new FireFigther(), 1);
- INITIAL_ELEMENTS_COUNT.put(new Cloud(), 0);
- INITIAL_ELEMENTS_COUNT.put(new MotorisedFirefigther(), 0);
- INITIAL_ELEMENTS_COUNT.put(new Mountain(), 100);
- INITIAL_ELEMENTS_COUNT.put(new Road(), 0);
- INITIAL_ELEMENTS_COUNT.put(new Rockerie(), 0);
+ INITIAL_ELEMENTS_COUNT.put(new Fire(), 10);
+ INITIAL_ELEMENTS_COUNT.put(new FireFigther(), 10);
+ INITIAL_ELEMENTS_COUNT.put(new Cloud(), 10);
+ INITIAL_ELEMENTS_COUNT.put(new MotorisedFirefigther(), 10);
+ INITIAL_ELEMENTS_COUNT.put(new Mountain(), 10);
+ INITIAL_ELEMENTS_COUNT.put(new Road(), 10);
+ INITIAL_ELEMENTS_COUNT.put(new Rockerie(), 10);
}
@@ -59,9 +59,9 @@ public class SimulatorApplication extends javafx.application.Application {
URL location = SimulatorApplication.class.getResource(VIEW_RESOURCE_PATH);
loader.setLocation(location);
view = loader.load();
- //ControllerFireFigtherBord controller = loader.getController();
- //controller.initialize(SQUARE_WIDTH, SQUARE_HEIGHT, COLUMN_COUNT, ROW_COUNT,INITIAL_ELEMENTS_COUNT
- // );
+ ControllerFireFigtherBord controller = loader.getController();
+ controller.initialize(SQUARE_WIDTH, SQUARE_HEIGHT, COLUMN_COUNT, ROW_COUNT,INITIAL_ELEMENTS_COUNT
+ );
}
private void showScene() {
diff --git a/src/main/java/controller/controllerMenu.java b/src/main/java/controller/controllerMenu.java
index f6ffd5fa263a268b99943afe1c644c438ce97be6..99f45ea0a7142d8635109dc454d9d88395c64176 100644
--- a/src/main/java/controller/controllerMenu.java
+++ b/src/main/java/controller/controllerMenu.java
@@ -1,4 +1,39 @@
package controller;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+
+
+
+
+
+import java.awt.*;
+
+
public class controllerMenu {
+ @FXML
+ private Button FireFighter;
+
+
+ @FXML
+ public void exit(ActionEvent actionEvent) {
+ System.exit(0);
+
+ }
+ public void FireFighter(ActionEvent actionEvent){
+
+
+
+ }
+ public void Virus(ActionEvent actionEvent){
+
+ }
+ public void Settings(ActionEvent actionEvent){
+
+
+ }
+ public void play(ActionEvent actionEvent){
+
+
+ }
}
diff --git a/src/main/java/controller/fireFigther/ContollerPutElementCount.java b/src/main/java/controller/fireFigther/ContollerPutElementCount.java
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/src/main/java/controller/fireFigther/ControllerPutElementCountController.java b/src/main/java/controller/fireFigther/ControllerPutElementCountController.java
new file mode 100644
index 0000000000000000000000000000000000000000..a309dce886ad8ae15da8991b270e905dc708b69e
--- /dev/null
+++ b/src/main/java/controller/fireFigther/ControllerPutElementCountController.java
@@ -0,0 +1,62 @@
+package controller.fireFigther;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.Spinner;
+import javafx.scene.image.ImageView;
+
+public class ControllerPutElementCountController {
+
+ @FXML
+ private Spinner<Integer> fire;
+
+ @FXML
+ private Spinner<Integer> firefighter;
+
+ @FXML
+ private Spinner<Integer> cloud;
+
+ @FXML
+ private Spinner<Integer> motorisedFireFighter;
+
+ @FXML
+ private Spinner<Integer> mountain;
+
+ @FXML
+ private Spinner<Integer> road;
+
+ @FXML
+ private Spinner<Integer> rockerie;
+
+ @FXML
+ private Button button;
+
+ @FXML
+ private Label cloudLabel;
+
+ @FXML
+ private Label motorisedFireFighterLabel;
+
+ @FXML
+ private Label mountainLabel;
+
+ @FXML
+ private Label roadLabel;
+
+ @FXML
+ private Label rockerieLabel;
+
+ @FXML
+ private ImageView imageView;
+
+ @FXML
+ private void initialize() {
+ }
+
+ @FXML
+ private void handleButtonClick(ActionEvent event) {
+ System.out.println("Button clicked!");
+ }
+}
diff --git a/src/main/resources/view/fireFigtherView/putElementCount.fxml b/src/main/resources/view/fireFigtherView/putElementCount.fxml
index 1db5954f197533fb78584ae34fceddf929e324fd..3d8003d6466fe273c17056ff7be7d0abc7d6f623 100644
--- a/src/main/resources/view/fireFigtherView/putElementCount.fxml
+++ b/src/main/resources/view/fireFigtherView/putElementCount.fxml
@@ -4,17 +4,17 @@
<?import javafx.scene.image.*?>
<?import javafx.scene.layout.*?>
-<AnchorPane fx:id="Fire" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="434.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1">
+<AnchorPane fx:id="putElementCount" fx:controller="controller.fireFigther.ControllerPutElementCountController" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="434.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1">
<children>
- <Spinner fx:id="fire" editable="true" layoutX="106.0" layoutY="31.0" prefHeight="25.0" prefWidth="363.0" />
+ <Spinner fx:id="fire" editable="true" layoutX="106.0" layoutY="31.0" prefHeight="25.0" prefWidth="363.0" value="10" min="1" max="100" />
<Label layoutX="265.0" layoutY="14.0" text="Fire" />
<Label layoutX="245.0" layoutY="64.0" text="Fire Fighter" />
- <Spinner layoutX="106.0" layoutY="82.0" prefHeight="25.0" prefWidth="363.0" />
- <Spinner layoutX="102.0" layoutY="134.0" prefHeight="25.0" prefWidth="363.0" />
- <Spinner layoutX="106.0" layoutY="186.0" prefHeight="25.0" prefWidth="363.0" />
- <Spinner layoutX="102.0" layoutY="234.0" prefHeight="25.0" prefWidth="363.0" />
- <Spinner layoutX="101.0" layoutY="286.0" prefHeight="25.0" prefWidth="355.0" />
- <Spinner layoutX="100.0" layoutY="335.0" prefHeight="25.0" prefWidth="355.0" />
+ <Spinner fx:id="firefighter" layoutX="106.0" layoutY="82.0" prefHeight="25.0" prefWidth="363.0" value="10" min="1" max="100"/>
+ <Spinner fx:id="Cloud" layoutX="102.0" layoutY="134.0" prefHeight="25.0" prefWidth="363.0" value="10" min="1" max="100" />
+ <Spinner fx:id="MotorisedFireFighter" layoutX="106.0" layoutY="186.0" prefHeight="25.0" prefWidth="363.0" value="10" min="1" max="100" />
+ <Spinner fx:id="Mountain" layoutX="102.0" layoutY="234.0" prefHeight="25.0" prefWidth="363.0" value="10" min="1" max="100"/>
+ <Spinner fx:id="Road" layoutX="101.0" layoutY="286.0" prefHeight="25.0" prefWidth="355.0" value="10" min="1" max="100"/>
+ <Spinner fx:id="Rockerie" layoutX="100.0" layoutY="335.0" prefHeight="25.0" prefWidth="355.0" value="10" min="1" max="100"/>
<Button layoutX="229.0" layoutY="376.0" mnemonicParsing="false" prefHeight="55.0" prefWidth="92.0" text="Button" />
<Label layoutX="259.0" layoutY="116.0" text="Cloud" />
<Label layoutX="215.0" layoutY="169.0" text="Motorised Fire Fighter" />
diff --git a/src/main/resources/view/menu.fxml b/src/main/resources/view/menu.fxml
index 40c574685ad41b34e7799f3582f66b2fadeaf54b..e974135e404bb15ad97b487aec3080719a8f7dc3 100644
--- a/src/main/resources/view/menu.fxml
+++ b/src/main/resources/view/menu.fxml
@@ -3,13 +3,11 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
-
<AnchorPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="controller.controllerMenu">
<children>
- <Button layoutX="36.0" layoutY="119.0" mnemonicParsing="false" prefHeight="106.0" prefWidth="259.0" text="firefiter" />
- <Button layoutX="321.0" layoutY="119.0" mnemonicParsing="false" prefHeight="106.0" prefWidth="259.0" text="virus" />
- <Button layoutX="193.0" layoutY="279.0" mnemonicParsing="false" prefHeight="56.0" prefWidth="231.0" text="play" />
- <Button layoutX="541.0" layoutY="14.0" mnemonicParsing="false" prefHeight="41.0" prefWidth="45.0" text="setting" />
- <Button layoutX="14.0" layoutY="14.0" mnemonicParsing="false" prefHeight="35.0" prefWidth="96.0" text="exit" />
+ <Button fx:id="FireFighter" layoutX="36.0" layoutY="119.0" mnemonicParsing="false" onAction="#FireFighter" prefHeight="106.0" prefWidth="259.0" text="firefiter" />
+ <Button fx:id="Virus" layoutX="321.0" layoutY="119.0" mnemonicParsing="false" onAction="#Virus" prefHeight="106.0" prefWidth="259.0" text="virus" />
+ <Button fx:id="Settings" layoutX="541.0" layoutY="14.0" mnemonicParsing="false" onAction="#Settings" prefHeight="41.0" prefWidth="45.0" text="setting" />
+ <Button layoutX="14.0" layoutY="14.0" mnemonicParsing="false" onAction="#exit" prefHeight="35.0" prefWidth="96.0" text="exit" />
</children>
</AnchorPane>