diff --git a/app/src/main/java/gui/menu/SoloMenu.java b/app/src/main/java/gui/menu/SoloMenu.java index 01dff9a..0dc3d36 100644 --- a/app/src/main/java/gui/menu/SoloMenu.java +++ b/app/src/main/java/gui/menu/SoloMenu.java @@ -9,6 +9,10 @@ import sudoku.structure.SudokuFactory; public class SoloMenu extends BaseView { private final ImInt sudokuType = new ImInt(0); + + private final ImInt difficulty = new ImInt(Difficulty.Medium.ordinal()); + private final String[] difficulties; + private static final String[] sudokuTypes = { "Carré", "Rectangle", "Multidoku" }; private static final int SQUARE = 0, RECTANGLE = 1, MULTIDOKU = 2; @@ -19,12 +23,17 @@ public class SoloMenu extends BaseView { public SoloMenu(StateMachine stateMachine) { super(stateMachine); + Difficulty[] diffs = Difficulty.values(); + difficulties = new String[diffs.length]; + for (int i = 0; i < diffs.length; i++) { + difficulties[i] = diffs[i].getDisplayName(); + } } private void pushSudokuState(MultiDoku doku, boolean empty) { if (!empty) { try { - SudokuFactory.fillDoku(doku, Difficulty.Easy); + SudokuFactory.fillDoku(doku, Difficulty.values()[difficulty.get()]); } catch (Exception e) { e.printStackTrace(); } @@ -36,6 +45,7 @@ public class SoloMenu extends BaseView { public void render() { ImGui.text("Solo"); ImGui.combo("Type de Sudoku", sudokuType, sudokuTypes); + ImGui.combo("Difficulté", difficulty, difficulties); switch (sudokuType.get()) { case SQUARE: ImGui.inputInt("Taille", sudokuSize); diff --git a/app/src/main/java/sudoku/structure/Difficulty.java b/app/src/main/java/sudoku/structure/Difficulty.java index b79d261..0952255 100644 --- a/app/src/main/java/sudoku/structure/Difficulty.java +++ b/app/src/main/java/sudoku/structure/Difficulty.java @@ -3,12 +3,18 @@ package sudoku.structure; //TODO: melvyn va passer par là public enum Difficulty { - VeryEasy(0.1), Easy(0.25), Medium(0.5), Hard(0.75); - - double factor; + VeryEasy("Très facile", 0.1), Easy("Facile", 0.25), Medium("Moyen", 0.5), Hard("Difficile", 0.75); - Difficulty(double factor) { + double factor; + String displayName; + + Difficulty(String displayName, double factor) { this.factor = factor; + this.displayName = displayName; + } + + public String getDisplayName() { + return displayName; } public double getFactor() {