diff --git a/src/View/RunSolver/Window.py b/src/View/RunSolver/Window.py index dcf39b5cd2c7aaf4c9ec863411fe97509263f612..f0cf737c8659f390dcf16729ce68ffe17170c08e 100644 --- a/src/View/RunSolver/Window.py +++ b/src/View/RunSolver/Window.py @@ -182,21 +182,30 @@ class SolverLogWindow(PamhyrWindow): self._alarm.timeout.connect(self.update) def _log(self, msg, color=None): - if msg is str: + if type(msg) is str: + logger.info(f"solver: {msg}") + msg = msg.rsplit('\n')[0] if color is not None: msg = f"<font color=\"{color}\">" + msg + "</font>" self.find(QTextEdit, "textEdit").append(msg) + elif type(msg) is int: + logger.info(f"solver: Returns {msg}") - elif msg is int: color = "blue" if msg == 0 else "red" self.find(QTextEdit, "textEdit")\ .append(f"<font color=\"{color}\">" + f" *** Finished with code {msg}" + "</font>") + self.statusbar.showMessage( + "Done" if msg == 0 else "Failed", + 3000 + ) + + def update(self): if self._solver.is_stoped(): self.find(QAction, "action_start").setEnabled(True) diff --git a/src/View/ui/SolverLog.ui b/src/View/ui/SolverLog.ui index c94c57dbc14a5d0e81ea240ba405c1ee08a203ab..7f9ce7b1d311cd1307fd9b9b70c74539e155e87b 100644 --- a/src/View/ui/SolverLog.ui +++ b/src/View/ui/SolverLog.ui @@ -22,6 +22,9 @@ <family>Monospace</family> </font> </property> + <property name="locale"> + <locale language="English" country="Europe"/> + </property> <property name="documentTitle"> <string notr="true"/> </property>