Fixes #32

app/src/main/java/gui/Main.java

@@ -31,7 +31,7 @@ public class Main extends Application {
     @Override
     protected void preRun() {
         super.preRun();
-        Images.loadImages();
+        Images.reloadImages();
     }
 
     @Override

app/src/main/java/gui/constants/Images.java

@@ -32,8 +32,8 @@ public class Images {
 		return textureID;
 	}
 
-	public static void loadImages() {
+	public static void reloadImages() {
-		BACKGROUND = loadTexture("background.png");
+		BACKGROUND = loadTexture(Options.BackgroundPath);
 	}
 
 }

app/src/main/java/gui/constants/Options.java

@@ -4,5 +4,6 @@ public class Options {
 
 	public static Symbols Symboles = Symbols.Numbers;
 	public static float BackgroundSpeed = 1.0f;
+	public static String BackgroundPath = "background.png";
 
 }

app/src/main/java/gui/menu/ConnexionStatusView.java

@@ -14,12 +14,12 @@ public class ConnexionStatusView extends BaseView {
 
 	private String displayText = "Connecting ...";
 
-	public ConnexionStatusView(StateMachine stateMachine, String address, short port)
+	public ConnexionStatusView(StateMachine stateMachine, String pseudo, String address, short port)
 			throws UnknownHostException, IOException {
 		super(stateMachine);
 		Thread t = new Thread(() -> {
 			try {
-				this.client = new Client(address, port);
+				this.client = new Client(pseudo, address, port);
 				bindListeners();
 			} catch (IOException e) {
 				e.printStackTrace();
@@ -29,12 +29,13 @@ public class ConnexionStatusView extends BaseView {
 		t.start();
 	}
 
-	public ConnexionStatusView(StateMachine stateMachine, short port) throws UnknownHostException, IOException {
+	public ConnexionStatusView(StateMachine stateMachine, String pseudo, short port)
+			throws UnknownHostException, IOException {
 		super(stateMachine);
 		Thread t = new Thread(() -> {
 			try {
 				this.server = new Server(port);
-				this.client = new Client("localhost", port);
+				this.client = new Client(pseudo, "localhost", port);
 				bindListeners();
 			} catch (IOException e) {
 				e.printStackTrace();

app/src/main/java/gui/menu/MultiMenu.java

@@ -1,6 +1,7 @@
 package gui.menu;
 
 import java.io.IOException;
+import java.util.Random;
 
 import imgui.ImGui;
 import imgui.ImVec2;
@@ -11,6 +12,7 @@ public class MultiMenu extends BaseView {
 
 	private final ImInt port = new ImInt(25565);
 	private final ImString address = new ImString("localhost");
+	private final ImString pseudo = new ImString("Joueur" + new Random().nextInt());
 
 	public MultiMenu(StateMachine stateMachine) {
 		super(stateMachine);
@@ -22,9 +24,10 @@ public class MultiMenu extends BaseView {
 		ImGui.beginChild("##CreateGame", new ImVec2(displaySize.x / 2.0f, displaySize.y * 8.0f / 9.0f));
 		if (ImGui.inputInt("Port", port))
 			port.set(Math.clamp(port.get(), 1, 65535));
+		ImGui.inputText("Pseudo", pseudo);
 		if (ImGui.button("Créer")) {
 			try {
-				this.stateMachine.pushState(new ConnexionStatusView(stateMachine, (short) port.get()));
+				this.stateMachine.pushState(new ConnexionStatusView(stateMachine, pseudo.get(), (short) port.get()));
 			} catch (IOException e) {
 				e.printStackTrace();
 			}
@@ -38,6 +41,7 @@ public class MultiMenu extends BaseView {
 		ImGui.inputText("Adresse", address);
 		if (ImGui.inputInt("Port", port))
 			port.set(Math.clamp(port.get(), 1, 65535));
+		ImGui.inputText("Pseudo", pseudo);
 		if (ImGui.button("Rejoindre")) {
 			try {
 				this.stateMachine.pushState(new ConnexionStatusView(stateMachine, address.get(), (short) port.get()));

app/src/main/java/gui/menu/MultiPlayerView.java

@@ -78,4 +78,9 @@ public class MultiPlayerView extends BaseView {
 		renderGameStatus();
 	}
 
+	@Override
+	public void cleanResources() {
+		this.selector.clean();
+	}
+
 }

app/src/main/java/gui/menu/OptionsMenu.java

@@ -1,8 +1,11 @@
 package gui.menu;
 
+import gui.constants.Images;
 import gui.constants.Options;
 import gui.constants.Symbols;
 import imgui.ImGui;
+import imgui.extension.imguifiledialog.ImGuiFileDialog;
+import imgui.extension.imguifiledialog.flag.ImGuiFileDialogFlags;
 import imgui.type.ImInt;
 
 public class OptionsMenu extends BaseView {
@@ -14,6 +17,30 @@ public class OptionsMenu extends BaseView {
 		super(stateMachine);
 	}
 
+	private void renderImageSelectDialog() {
+		if (ImGuiFileDialog.display("browse-img", ImGuiFileDialogFlags.None)) {
+			if (ImGuiFileDialog.isOk()) {
+				var selection = ImGuiFileDialog.getSelection();
+				for (var entry : selection.entrySet()) {
+					try {
+						String filePath = entry.getValue();
+						Options.BackgroundPath = filePath;
+						Images.reloadImages();
+					} catch (Exception e) {
+						e.printStackTrace();
+					}
+				}
+			}
+			ImGuiFileDialog.close();
+		}
+	}
+
+	private void renderImageSelectButton() {
+		if (ImGui.button("Changer de fond d'écran"))
+			ImGuiFileDialog.openDialog("browse-img", "Choisissez un fichier", ".png,.jpg,.jpeg", ".");
+		renderImageSelectDialog();
+	}
+
 	@Override
 	public void render() {
 		ImGui.text("Options");
@@ -23,6 +50,7 @@ public class OptionsMenu extends BaseView {
 		if (ImGui.sliderFloat("Vitesse d'animation de l'arrière plan", backgroundSpeed, 0.0f, 10.0f)) {
 			Options.BackgroundSpeed = backgroundSpeed[0];
 		}
+		renderImageSelectButton();
 		renderReturnButton();
 	}
 

app/src/main/java/gui/menu/SoloMenu.java

@@ -25,4 +25,9 @@ public class SoloMenu extends BaseView {
 		renderReturnButton();
 	}
 
+	@Override
+	public void cleanResources() {
+		this.sudokuSelector.clean();
+	}
+
 }

app/src/main/java/gui/menu/SudokuView.java

@@ -92,6 +92,7 @@ public class SudokuView extends BaseView {
 	}
 
 	private void startSolve(Solver solver) {
+		this.doku.clearMutableCells();
 		resolveThread = new Thread(() -> {
 			List<SolverStep> steps = new ArrayList<>();
 			try {
@@ -158,6 +159,8 @@ public class SudokuView extends BaseView {
 	private void renderClearButton() {
 		if (centeredButton("Effacer")) {
 			this.doku.clearMutableCells();
+			this.resolved = false;
+			this.unresolved = false;
 		}
 	}
 

app/src/main/java/gui/widget/SmoothProgressBar.java

@@ -9,13 +9,22 @@ public class SmoothProgressBar {
 	private final float speed = 2.0f;
 	private final float clipConstant = 0.001f;
 
-	public void render(String label, ImVec2 size, float progress) {
+	private void updateProgress(float newProgress) {
-		float delta = progress - lastProgress;
+		float delta = newProgress - lastProgress;
 		if (Math.abs(delta) < clipConstant)
-			lastProgress = progress;
+			lastProgress = newProgress;
 		else
 			lastProgress = lastProgress + delta * ImGui.getIO().getDeltaTime() * speed;
+	}
+
+	public void render(String label, ImVec2 size, float progress) {
+		updateProgress(progress);
 		ImGui.progressBar(lastProgress, size, label);
 	}
 
+	public void render(float progress) {
+		updateProgress(progress);
+		ImGui.progressBar(lastProgress);
+	}
+
 }

app/src/main/java/gui/widget/SudokuSelector.java

@@ -35,10 +35,15 @@ public class SudokuSelector {
 
 	private final String confirmMessage;
 
+	private Thread genThread = null;
+
+	private final SmoothProgressBar genProgressBar;
+
 	public SudokuSelector(boolean canGenEmptyGrid, String confirmMessage) {
 		this.canGenEmptyGrid = canGenEmptyGrid;
 		this.confirmMessage = confirmMessage;
 		initConstraints();
+		this.genProgressBar = new SmoothProgressBar();
 	}
 
 	private List<IConstraint> getConstraints() {
@@ -56,16 +61,39 @@ public class SudokuSelector {
 		}
 	}
 
+	private void stopGenThread() {
+		if (this.genThread != null) {
+			this.genThread.interrupt();
+			this.genThread = null;
+		}
+	}
+
+	private void renderGenProgress() {
+		if (ImGui.beginPopup("genProgress")) {
+			ImGui.text("Loading ...");
+			int filled = this.doku.getFilledCells().size();
+			int total = this.doku.getCells().size();
+			this.genProgressBar.render(filled / (float) total);
+			ImGui.endPopup();
+		} else {
+			stopGenThread();
+		}
+	}
+
 	private void selectSudoku(MultiDoku doku, boolean empty) {
 		this.doku = doku;
+		ImGui.openPopup("genProgress");
+		this.genThread = new Thread(() -> {
 			if (!empty) {
 				try {
 					SudokuFactory.fillDoku(doku, Difficulty.values()[difficulty.get()]);
+					this.onSelect.emit(this.doku);
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
 			}
-		this.onSelect.emit(this.doku);
+		});
+		this.genThread.start();
 	}
 
 	public void renderFileDialog() {
@@ -131,7 +159,12 @@ public class SudokuSelector {
 		if (ImGui.button("À partir d'un fichier")) {
 			ImGuiFileDialog.openDialog("browse-sudoku", "Choisissez un fichier", ".json", ".");
 		}
+		renderGenProgress();
 		renderFileDialog();
 	}
 
+	public void clean() {
+		stopGenThread();
+	}
+
 }

app/src/main/java/network/client/Client.java

@@ -28,12 +28,10 @@ public class Client {
 
 	String disconnectReason = null;
 
-	public Client(String address, short port) throws UnknownHostException, IOException {
+	public Client(String pseudo, String address, short port) throws UnknownHostException, IOException {
 		this.clientConnection = new ClientConnexion(address, port, this);
 		this.game = new Game();
-		// temp
+		login(pseudo);
-		Random r = new Random();
-		login("Player" + r.nextInt());
 	}
 
 	public void login(String pseudo) {

app/src/main/java/sudoku/io/ConsoleInterface.java

@@ -227,7 +227,7 @@ public class ConsoleInterface {
                 saveMultiDoku(doku);
                 break;
             case "solution":
-                solve(doku);
+                solve(doku, listSymbols, width, height);
                 break;
             case "exit":
                 exit();
@@ -238,21 +238,52 @@ public class ConsoleInterface {
         }
     }
 
-    private void solve(MultiDoku doku){
+    private void applyStep(SolverStep step) {
-        System.out.println("Pick a solver to use : random ('random', default), human ('human') or mixed solver ('mixed').");
+        step.getCell().setSymbolIndex(step.getNewValue());
+    }
+
+    private boolean showStep(MultiDoku doku, List<String> listSymbols, int width, int height, SolverStep step) {
+        System.out.println("Here is the step : \n");
+        showMultidoku(doku, listSymbols, width, height);
+        applyStep(step);
+        System.out.println("\nTurns into :\n");
+        showMultidoku(doku, listSymbols, width, height);
+        System.out.println("Do you want to see the next step ? (y/n, default n)");
+        return reader.next().equals("y");
+    }
+
+    private void showSolveSteps(MultiDoku doku, List<String> listSymbols, int width, int height, List<SolverStep> steps) {
+        System.out.println("Would you like to see the steps of the solver ? (y/n, default n)");
+        doku.getStateManager().popState();
         switch (reader.next()) {
-            case "human":
+            case "y":
-                new HumanSolver().solve(doku);
+                int stepCount = 0;
-                break;
+                while(stepCount < steps.size() && showStep(doku, listSymbols, width, height, steps.get(stepCount))){stepCount++;}
-            case "mixed":
-                new MixedSolver().solve(doku);
                 break;
+        
             default:
-                new RandomSolver().solve(doku);
                 break;
         }
     }
 
+    private void solve(MultiDoku doku, List<String> listSymbols, int width, int height){
+        System.out.println("Pick a solver to use : random ('random', default), human ('human') or mixed solver ('mixed').");
+        List<SolverStep> steps = new ArrayList<>();
+        doku.getStateManager().pushState();
+        switch (reader.next()) {
+            case "human":
+                new HumanSolver().solve(doku, steps);
+                break;
+            case "mixed":
+                new MixedSolver().solve(doku, steps);
+                break;
+            default:
+                new RandomSolver().solve(doku, steps);
+                break;
+        }
+        showSolveSteps(doku, listSymbols, width, height, steps);
+    }
+
     private void play(MultiDoku doku, List<String> listSymbols, int width, int height) {
         int x, y;
         RenderableMultidoku rdoku = RenderableMultidoku.fromMultidoku(doku);

app/src/main/java/sudoku/solver/HumanSolver.java

@@ -2,13 +2,9 @@ package sudoku.solver;
 
 import java.util.List;
 import java.util.concurrent.CancellationException;
-import java.util.logging.Level;
 
-import gui.constants.Symbols;
-import sudoku.io.SudokuPrinter;
 import sudoku.structure.Cell;
 import sudoku.structure.MultiDoku;
-import sudoku.structure.Sudoku;
 
 public class HumanSolver implements Solver {
 
@@ -23,13 +19,6 @@ public class HumanSolver implements Solver {
 		if (Thread.interrupted())
 			throw new CancellationException("User wants to stop the solver");
 
-		Sudoku sudoku = doku.getSubGrid(0);
-		logger.log(Level.FINE,
-				'\n' + SudokuPrinter.toStringRectangleSudoku(sudoku,
-						sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getBlockWidth(),
-						sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getSize() / sudoku.getBlockWidth(),
-						Symbols.Numbers));
-
 		if (doku.isSolved()) {
 			return true;
 		}

app/src/main/java/sudoku/solver/MixedSolver.java

@@ -3,13 +3,9 @@ package sudoku.solver;
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.CancellationException;
-import java.util.logging.Level;
 
-import gui.constants.Symbols;
-import sudoku.io.SudokuPrinter;
 import sudoku.structure.Cell;
 import sudoku.structure.MultiDoku;
-import sudoku.structure.Sudoku;
 
 public class MixedSolver implements Solver {
 
@@ -28,14 +24,6 @@ public class MixedSolver implements Solver {
             throw new CancellationException("User wants to stop the solver");
         }
 
-        Sudoku sudoku = doku.getSubGrid(0);
-        logger.log(Level.FINE,
-                '\n' + SudokuPrinter.toStringRectangleSudoku(
-                        sudoku,
-                        sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getBlockWidth(),
-                        sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getSize() / sudoku.getBlockWidth(),
-                        Symbols.Numbers));
-
         if (doku.isSolved()) {
             return true;
         }

app/src/main/java/sudoku/solver/RandomSolver.java

@@ -3,13 +3,9 @@ package sudoku.solver;
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.CancellationException;
-import java.util.logging.Level;
 
-import gui.constants.Symbols;
-import sudoku.io.SudokuPrinter;
 import sudoku.structure.Cell;
 import sudoku.structure.MultiDoku;
-import sudoku.structure.Sudoku;
 
 public class RandomSolver implements Solver {
 
@@ -28,13 +24,6 @@ public class RandomSolver implements Solver {
         if (Thread.interrupted())
             throw new CancellationException("User wants to stop the solver");
 
-        Sudoku sudoku = doku.getSubGrid(0);
-        logger.log(Level.FINE,
-                '\n' + SudokuPrinter.toStringRectangleSudoku(sudoku,
-                        sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getBlockWidth(),
-                        sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getSize() / sudoku.getBlockWidth(),
-                        Symbols.Numbers));
-
         if (doku.isSolved()) {
             return true;
         }