diff --git a/ProjetJava/src/main/java/views/PrimaryWindow.java b/ProjetJava/src/main/java/views/PrimaryWindow.java index bbcb1104b3cb56e5c908ff88574f9b1df31abe9d..e6ecc43d128b408ccca79846398b35644b4ad189 100644 --- a/ProjetJava/src/main/java/views/PrimaryWindow.java +++ b/ProjetJava/src/main/java/views/PrimaryWindow.java @@ -116,7 +116,7 @@ public class PrimaryWindow extends JFrame { CalculPanel p = new CalculPanel(gameLevel); // Question - QuestionPanel panelQuestion = new QuestionPanel(); + QuestionPanel panelQuestion = new QuestionPanel(gameLevel); // Ajout des onglets visibles tabbedPane.addTab("Dessin", ardoise); diff --git a/ProjetJava/src/main/java/views/QuestionPanel.java b/ProjetJava/src/main/java/views/QuestionPanel.java index f35c3683c02827d8a16b38843f33855c47a4498e..243470d870eee3ea35ba709ee0f7342efa46db2c 100644 --- a/ProjetJava/src/main/java/views/QuestionPanel.java +++ b/ProjetJava/src/main/java/views/QuestionPanel.java @@ -13,6 +13,7 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTextField; import models.Questions; +import services.GameLevel; import services.QuestionService; /** @@ -29,11 +30,11 @@ public final class QuestionPanel extends JPanel { private QuestionService service; private Questions currentQuestion; - // Niveau par dĂ©faut - private int currentLevel = 1; - - public QuestionPanel() { + // Niveau + private GameLevel gameLevel; + public QuestionPanel(GameLevel gameLevel) { + this.gameLevel = gameLevel; // ---- DESIGN ---- \\ // Layout principal setLayout(new BorderLayout()); @@ -142,7 +143,7 @@ public final class QuestionPanel extends JPanel { * niveau et l'affiche dans la fenĂȘtre du jeu */ public void loadNewQuestion() { - currentQuestion = service.pickQuestion(currentLevel); + currentQuestion = service.pickQuestion(gameLevel.getLevel().getValue()); if (currentQuestion != null) { labelQuestion.setText(currentQuestion.getQuestion());