diff --git a/code/jeu de la vie/rsrc/FXML/VueJeu.fxml b/code/jeu de la vie/rsrc/fxml/VueJeu.fxml similarity index 53% rename from code/jeu de la vie/rsrc/FXML/VueJeu.fxml rename to code/jeu de la vie/rsrc/fxml/VueJeu.fxml index b21e66f..5228e76 100644 --- a/code/jeu de la vie/rsrc/FXML/VueJeu.fxml +++ b/code/jeu de la vie/rsrc/fxml/VueJeu.fxml @@ -1,15 +1,12 @@ - - - + - @@ -22,11 +19,6 @@ - - - - - @@ -40,14 +32,48 @@ - - + + + + + + + + + + + + + + + + + - + + + + + + + + + + + +
+ + + + + + + +
diff --git a/code/jeu de la vie/src/FXML/VueJeu.java b/code/jeu de la vie/src/FXML/VueJeu.java deleted file mode 100644 index 63b9c5a..0000000 --- a/code/jeu de la vie/src/FXML/VueJeu.java +++ /dev/null @@ -1,26 +0,0 @@ -package FXML; - -import javafx.fxml.FXML; -import javafx.scene.control.Spinner; -import javafx.scene.layout.GridPane; -import javafx.scene.paint.Paint; -import javafx.scene.shape.Rectangle; - -public class VueJeu { - @FXML - private GridPane map = new GridPane(); - - @FXML - private Spinner rowGame = new Spinner(); - - @FXML - private Spinner colGame = new Spinner(); - - public void initialize() { - for(int i=0; i<50; ++i){ - for(int j=0; j<50; ++j) { - map.add(new Rectangle(10, 10, Paint.valueOf("#AABBCC")), i, j); - } - } - } -} diff --git a/code/jeu de la vie/src/launcher/Launcher.java b/code/jeu de la vie/src/launcher/Launcher.java index 1c9b5d0..de9a8b6 100644 --- a/code/jeu de la vie/src/launcher/Launcher.java +++ b/code/jeu de la vie/src/launcher/Launcher.java @@ -9,8 +9,9 @@ import javafx.stage.Stage; public class Launcher extends Application { @Override public void start(Stage primaryStage) throws Exception { - Parent root = FXMLLoader.load(this.getClass().getResource("/FXML/VueJeu.fxml")); + Parent root = FXMLLoader.load(this.getClass().getResource("/fxml/VueJeu.fxml")); Scene sc = new Scene(root); + primaryStage.setTitle("Jeu de la vie"); primaryStage.setScene(sc); primaryStage.show(); diff --git a/code/jeu de la vie/src/views/VueJeu.java b/code/jeu de la vie/src/views/VueJeu.java new file mode 100644 index 0000000..d80ded6 --- /dev/null +++ b/code/jeu de la vie/src/views/VueJeu.java @@ -0,0 +1,43 @@ +package views; + +import javafx.fxml.FXML; +import javafx.scene.control.*; +import javafx.scene.control.cell.TextFieldListCell; +import javafx.scene.layout.GridPane; +import javafx.scene.paint.Paint; +import javafx.scene.shape.Rectangle; + +public class VueJeu { + @FXML + private GridPane map; + + @FXML + private TextField rowGame; + + @FXML + private TextField colGame; + + @FXML + private Button createGrid; + + @FXML + private Label nbRowGame; + + @FXML + private Label nbColGame; + + private void createGrid() { + for(int i=0; i < Integer.parseInt(rowGame.getText()); ++i){ + for(int j=0; j < Integer.parseInt(colGame.getText()); ++j) { + map.add(new Rectangle(10, 10, Paint.valueOf("#AABBCC")), i, j); + } + } + } + + public void initialize() { + createGrid(); + + nbColGame.setText(colGame.getText()); + nbRowGame.setText(rowGame.getText()); + } +}