diff --git a/src/Mod/Fem/femsolver/calculix/tasks.py b/src/Mod/Fem/femsolver/calculix/tasks.py index f8a7df2ffa..ab9894473b 100644 --- a/src/Mod/Fem/femsolver/calculix/tasks.py +++ b/src/Mod/Fem/femsolver/calculix/tasks.py @@ -95,19 +95,6 @@ class Solve(run.Solve): # self._updateOutput(output) del output # get flake8 quiet - def _observeSolver(self, process): - output = "" - line = process.stdout.readline() - self.pushStatus(line) - output += line - line = process.stdout.readline() - while line: - line = "\n%s" % line.rstrip() - self.pushStatus(line) - output += line - line = process.stdout.readline() - return output - class Results(run.Results): diff --git a/src/Mod/Fem/femsolver/elmer/tasks.py b/src/Mod/Fem/femsolver/elmer/tasks.py index f067ae2ae0..ef914fa80a 100644 --- a/src/Mod/Fem/femsolver/elmer/tasks.py +++ b/src/Mod/Fem/femsolver/elmer/tasks.py @@ -109,19 +109,6 @@ class Solve(run.Solve): self.report.error("ElmerSolver executable not found.") self.fail() - def _observeSolver(self, process): - output = b"" - line = process.stdout.readline() - self.pushStatus(line) - output += line - line = process.stdout.readline() - while line: - line = b"\n%s" % line.rstrip() - self.pushStatus(line) - output += line - line = process.stdout.readline() - return output - def _updateOutput(self, output): if self.solver.ElmerOutput is None: self._createOutput() diff --git a/src/Mod/Fem/femsolver/run.py b/src/Mod/Fem/femsolver/run.py index a5f9f4aa53..be28c82ff7 100644 --- a/src/Mod/Fem/femsolver/run.py +++ b/src/Mod/Fem/femsolver/run.py @@ -296,7 +296,19 @@ class Check(BaseTask): class Solve(BaseTask): - pass + + def _observeSolver(self, process): + output = "" + line = FemUtils.pydecode(process.stdout.readline()) + self.pushStatus(line) + output += line + line = FemUtils.pydecode(process.stdout.readline()) + while line: + line = "\n%s" % line.rstrip() + self.pushStatus(line) + output += line + line = FemUtils.pydecode(process.stdout.readline()) + return output class Prepare(BaseTask): diff --git a/src/Mod/Fem/femsolver/z88/tasks.py b/src/Mod/Fem/femsolver/z88/tasks.py index 82804e37c4..abb2a7400c 100644 --- a/src/Mod/Fem/femsolver/z88/tasks.py +++ b/src/Mod/Fem/femsolver/z88/tasks.py @@ -110,19 +110,6 @@ class Solve(run.Solve): # self._updateOutput(output) del output # get flake8 quiet - def _observeSolver(self, process): - output = "" - line = process.stdout.readline() - self.pushStatus(line) - output += line - line = process.stdout.readline() - while line: - line = "\n%s" % line.rstrip() - self.pushStatus(line) - output += line - line = process.stdout.readline() - return output - class Results(run.Results):