From 3bc43cb19930c50d20cf08d7b3c7138c883602b4 Mon Sep 17 00:00:00 2001
From: Adrien <adn.frndz@gmail.com>
Date: Thu, 24 Sep 2026 09:56:02 +0200
Subject: [PATCH 1/2] Enum Level et classe GameLevel (gestion de niveau)

---
 .../src/main/java/services/GameLevel.java     | 20 +++++++++++++++++++
 ProjetJava/src/main/java/utils/Level.java     | 20 +++++++++++++++++++
 .../src/main/java/views/PrimaryWindow.java    |  4 ++++
 3 files changed, 44 insertions(+)
 create mode 100644 ProjetJava/src/main/java/services/GameLevel.java
 create mode 100644 ProjetJava/src/main/java/utils/Level.java

diff --git a/ProjetJava/src/main/java/services/GameLevel.java b/ProjetJava/src/main/java/services/GameLevel.java
new file mode 100644
index 0000000..4fd1f7d
--- /dev/null
+++ b/ProjetJava/src/main/java/services/GameLevel.java
@@ -0,0 +1,20 @@
+package services;
+
+import utils.Level;
+
+/**
+ *
+ * @author Adrien
+ */
+public class GameLevel {
+
+    private Level level = Level.EASY;
+
+    public Level getLevel() {
+        return level;
+    }
+
+    public void setLevel(Level level) {
+        this.level = level;
+    }
+}
diff --git a/ProjetJava/src/main/java/utils/Level.java b/ProjetJava/src/main/java/utils/Level.java
new file mode 100644
index 0000000..091daca
--- /dev/null
+++ b/ProjetJava/src/main/java/utils/Level.java
@@ -0,0 +1,20 @@
+package utils;
+
+/**
+ *
+ * @author Adrien
+ */
+public enum Level {
+    EASY(1),
+    HARD(2);
+
+    private final int value;
+
+    Level(int value) {
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+}
diff --git a/ProjetJava/src/main/java/views/PrimaryWindow.java b/ProjetJava/src/main/java/views/PrimaryWindow.java
index ac79efb..ed20343 100644
--- a/ProjetJava/src/main/java/views/PrimaryWindow.java
+++ b/ProjetJava/src/main/java/views/PrimaryWindow.java
@@ -15,6 +15,7 @@ import javax.swing.JPanel;
 import javax.swing.JRadioButtonMenuItem;
 import javax.swing.JTabbedPane;
 import javax.swing.SwingUtilities;
+import services.GameLevel;
 
 /**
  *
@@ -106,6 +107,9 @@ public class PrimaryWindow extends JFrame {
 
         // Question
         QuestionPanel panelQuestion = new QuestionPanel();
+        
+        // Création du niveau de jeu
+        GameLevel gameLevel = new GameLevel();
 
         // Ajout des onglets visibles
         tabbedPane.addTab("Dessin", ardoise);
-- 
GitLab


From b20fe739d522d46726e0de96e9a1cc043413d828 Mon Sep 17 00:00:00 2001
From: Adrien <adn.frndz@gmail.com>
Date: Thu, 24 Sep 2026 10:49:36 +0200
Subject: [PATCH 2/2] =?UTF-8?q?Niveau=20fonctionnel=20et=20impl=C3=A9ment?=
 =?UTF-8?q?=C3=A9=20pour=20les=20calculs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ProjetJava/src/main/java/views/CalculPanel.java   | 10 +++++++---
 ProjetJava/src/main/java/views/PrimaryWindow.java | 10 +++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ProjetJava/src/main/java/views/CalculPanel.java b/ProjetJava/src/main/java/views/CalculPanel.java
index 0c3c02e..c28e021 100644
--- a/ProjetJava/src/main/java/views/CalculPanel.java
+++ b/ProjetJava/src/main/java/views/CalculPanel.java
@@ -20,6 +20,7 @@ import javax.swing.JPanel;
 import javax.swing.JTextField;
 import models.Calcul;
 import services.CalculService;
+import services.GameLevel;
 
 /**
  *
@@ -30,12 +31,15 @@ public class CalculPanel extends JPanel {
     // Initialiser le calcul
     private CalculService cs = new CalculService();
     private Calcul calcul;
+    private GameLevel gameLevel;
+
 
     Color lightGreen = new Color(180, 230, 180);
     Color lightRed = new Color(245, 190, 190);
 
-    public CalculPanel() {
-        this.calcul = cs.generateCalcul(1);
+    public CalculPanel(GameLevel gameLevel) {
+        this.gameLevel = gameLevel;
+        this.calcul = cs.generateCalcul(gameLevel.getLevel().getValue());
         // Layout principal
         setLayout(new BorderLayout());
 
@@ -107,7 +111,7 @@ public class CalculPanel extends JPanel {
         btnNewCalcul.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                calcul = cs.generateCalcul(1);
+                calcul = cs.generateCalcul(gameLevel.getLevel().getValue());
                 showCalcul(calcul, labelCalcul);
 
                 // Remet les réponses à 0
diff --git a/ProjetJava/src/main/java/views/PrimaryWindow.java b/ProjetJava/src/main/java/views/PrimaryWindow.java
index ed20343..3afd0fd 100644
--- a/ProjetJava/src/main/java/views/PrimaryWindow.java
+++ b/ProjetJava/src/main/java/views/PrimaryWindow.java
@@ -97,19 +97,19 @@ public class PrimaryWindow extends JFrame {
         menuBar.add(menuNiveau);
         menuBar.add(menuAdmin);
         setJMenuBar(menuBar); // Ajout du menu à la fenêtre
-
+        
+        // Création du niveau de jeu
+        GameLevel gameLevel = new GameLevel();
+        
         // Création des panneaux [activités]
         // Ardoise
         MagicSlate ardoise = new MagicSlate();
 
         // Calcul
-        CalculPanel p = new CalculPanel();
+        CalculPanel p = new CalculPanel(gameLevel);
 
         // Question
         QuestionPanel panelQuestion = new QuestionPanel();
-        
-        // Création du niveau de jeu
-        GameLevel gameLevel = new GameLevel();
 
         // Ajout des onglets visibles
         tabbedPane.addTab("Dessin", ardoise);
-- 
GitLab