diff --git a/ProjetJava/src/main/java/services/GameLevel.java b/ProjetJava/src/main/java/services/GameLevel.java new file mode 100644 index 0000000000000000000000000000000000000000..4fd1f7dc64403b2da9dde77a702b003acd41de20 --- /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 0000000000000000000000000000000000000000..091dacab84dc31eb2c7bf9ca48f03af951928f15 --- /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/CalculPanel.java b/ProjetJava/src/main/java/views/CalculPanel.java index 0c3c02e493e60d0daa2724ee4d861bfa0a5895ea..c28e02142baf4cdc8cd0a5e81a3bae0a3856508d 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 ac79efbf2971df0507000423463b42e63d60b4ee..3afd0fd6a36aafe311facc48fb23294e57aa6c37 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; /** * @@ -96,13 +97,16 @@ 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();