diff --git a/src/main/java/com/example/testig/Ecouteur.java b/src/main/java/com/example/testig/Ecouteur.java
index 6f56dc304f2fa1ea005f51b01471bd4779558640..d47792e394f4e30392c6d297b95b426803aba34e 100644
--- a/src/main/java/com/example/testig/Ecouteur.java
+++ b/src/main/java/com/example/testig/Ecouteur.java
@@ -3,6 +3,8 @@ package com.example.testig;
import javafx.event.ActionEvent;
import javafx.event.EventHandler;
import javafx.scene.control.Label;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
import java.util.Random;
@@ -31,8 +33,6 @@ public class Ecouteur implements EventHandler<ActionEvent> {
@Override
public void handle(ActionEvent actionEvent) {
-
-
System.out.println("Bienvenue dans le Jeu !"); //Question 2
System.out.println("Nombre de clicks : " + compteur); //Question 3
compteur += 1;
@@ -42,9 +42,120 @@ public class Ecouteur implements EventHandler<ActionEvent> {
x = random.nextInt(7);
y = random.nextInt(7);
- label1.setText(""+ n);
- label2.setText(""+ x);
- label3.setText(""+ y);
+
+ Image de_face1, de_face2, de_face3, de_face4, de_face5, de_face6;
+
+ de_face1 = new Image(getClass().getResourceAsStream("/de_face1.png"), 60, 60, true, true);
+ de_face2 = new Image(getClass().getResourceAsStream("/de_face2.png"), 60, 60, true, true);
+ de_face3 = new Image(getClass().getResourceAsStream("/de_face3.png"), 60, 60, true, true);
+ de_face4 = new Image(getClass().getResourceAsStream("/de_face4.png"), 60, 60, true, true);
+ de_face5 = new Image(getClass().getResourceAsStream("/de_face5.png"), 60, 60, true, true);
+ de_face6 = new Image(getClass().getResourceAsStream("/de_face6.png"), 60, 60, true, true);
+
+ ImageView de1_1 = new ImageView(de_face1);
+ ImageView de2_1 = new ImageView(de_face2);
+ ImageView de3_1 = new ImageView(de_face3);
+ ImageView de4_1 = new ImageView(de_face4);
+ ImageView de5_1 = new ImageView(de_face5);
+ ImageView de6_1 = new ImageView(de_face6);
+
+ ImageView de1_2 = new ImageView(de_face1);
+ ImageView de2_2 = new ImageView(de_face2);
+ ImageView de3_2 = new ImageView(de_face3);
+ ImageView de4_2 = new ImageView(de_face4);
+ ImageView de5_2 = new ImageView(de_face5);
+ ImageView de6_2 = new ImageView(de_face6);
+
+ ImageView de1_3 = new ImageView(de_face1);
+ ImageView de2_3 = new ImageView(de_face2);
+ ImageView de3_3 = new ImageView(de_face3);
+ ImageView de4_3 = new ImageView(de_face4);
+ ImageView de5_3 = new ImageView(de_face5);
+ ImageView de6_3 = new ImageView(de_face6);
+
+ switch(n){
+
+ case 1:
+ label1.setGraphic(de1_1);
+ break;
+
+ case 2:
+ label1.setGraphic(de2_1);
+ break;
+
+ case 3:
+ label1.setGraphic(de3_1);
+ break;
+
+ case 4:
+ label1.setGraphic(de4_1);
+ break;
+
+ case 5:
+ label1.setGraphic(de5_1);
+ break;
+
+ case 6:
+ label1.setGraphic(de6_1);
+ break;
+ }
+
+ switch(x){
+
+ case 1:
+ label2.setGraphic(de1_2);
+ break;
+
+ case 2:
+ label2.setGraphic(de2_2);
+ break;
+
+ case 3:
+ label2.setGraphic(de3_2);
+ break;
+
+ case 4:
+ label2.setGraphic(de4_2);
+ break;
+
+ case 5:
+ label2.setGraphic(de5_2);
+ break;
+
+ case 6:
+ label2.setGraphic(de6_2);
+ break;
+
+ }
+
+ switch(y){
+
+ case 1:
+ label3.setGraphic(de1_3);
+ break;
+
+ case 2:
+ label3.setGraphic(de2_3);
+ break;
+
+ case 3:
+ label3.setGraphic(de3_3);
+ break;
+
+ case 4:
+ label3.setGraphic(de4_3);
+ break;
+
+ case 5:
+ label3.setGraphic(de5_3);
+ break;
+
+ case 6:
+ label3.setGraphic(de6_3);
+ break;
+
+ }
+
if(n == 4 && x == 2 && y == 1){
diff --git a/src/main/java/com/example/testig/HelloApplication.java b/src/main/java/com/example/testig/HelloApplication.java
index 36eca43d108bc60e6c872919f03bca39ec9ec7c1..6a5628b92c20baa8dbf0bdcb26000fc47f735d2f 100644
--- a/src/main/java/com/example/testig/HelloApplication.java
+++ b/src/main/java/com/example/testig/HelloApplication.java
@@ -26,18 +26,26 @@ public class HelloApplication extends Application {
Button boutonJouer = new Button("Jouer");
Button boutonQuitter = new Button("Quitter");
- HBox box = new HBox();
+ HBox box1 = new HBox();
HBox box2 = new HBox();
- Label l1 = new Label("1"); //Question 4
- Label l2 = new Label("1");
- Label l3 = new Label("1");
+ Image de_face1 = new Image(getClass().getResourceAsStream("/de_face1.png"), 60, 60, true, true);
+ Image de_face10 = new Image(getClass().getResourceAsStream("/de_face1.png"), 60, 60, true, true);
+ Image de_face100 = new Image(getClass().getResourceAsStream("/de_face1.png"), 60, 60, true, true);
+
+ ImageView de1_1 = new ImageView(de_face1);
+ ImageView de1_2 = new ImageView(de_face10);
+ ImageView de1_3 = new ImageView(de_face100);
+
+ Label l1 = new Label("", de1_1); //Question 4
+ Label l2 = new Label("", de1_2);
+ Label l3 = new Label("", de1_3);
Label l4 = new Label("Nombre de fois ou 421 est apparu : 0 Nombre de coups joués : 0");
- box.getChildren().addAll(l1, l2, l3);
+ box1.getChildren().addAll(l1, l2, l3);
box2.getChildren().addAll(l4);
- border.setCenter(box);
+ border.setCenter(box1);
border.setBottom(boutonJouer);
border.setTop(box2);
border.setLeft(boutonQuitter);
@@ -45,7 +53,7 @@ public class HelloApplication extends Application {
boutonJouer.setOnAction(new Ecouteur(l1,l2,l3, l4));
boutonQuitter.setOnAction(new Ecouteur2());
- //Question 7
+ //Question 7 et 8
Image exit = new Image("exit_picture.png");
exit = new Image(getClass().getResourceAsStream("/exit_picture.png"), 36, 36, true, true);