From 3ff0883ecade5950cd5364fc37ee8b6251f79e4b Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Wed, 18 Oct 2023 14:24:14 +0200
Subject: [PATCH] RunSolver: Fix #15 and minor change.
---
src/View/RunSolver/Window.py | 13 +++++++++++--
src/View/ui/SolverLog.ui | 3 +++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/View/RunSolver/Window.py b/src/View/RunSolver/Window.py
index dcf39b5c..f0cf737c 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 c94c57db..7f9ce7b1 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>
--
GitLab