From ed4d27876b8484e291bd061000c81191d29766f0 Mon Sep 17 00:00:00 2001 From: Adrien Date: Thu, 24 Sep 2026 11:33:05 +0200 Subject: [PATCH] =?UTF-8?q?Niveau=20impl=C3=A9ment=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjetJava/src/main/java/views/PrimaryWindow.java | 2 +- ProjetJava/src/main/java/views/QuestionPanel.java | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ProjetJava/src/main/java/views/PrimaryWindow.java b/ProjetJava/src/main/java/views/PrimaryWindow.java index 3afd0fd..dc01881 100644 --- a/ProjetJava/src/main/java/views/PrimaryWindow.java +++ b/ProjetJava/src/main/java/views/PrimaryWindow.java @@ -109,7 +109,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 f35c368..243470d 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()); -- GitLab