kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Fem: Prevent race condition between signals in timer update

Browse Source
This commit is contained in:
marioalexis
2024-11-05 00:40:49 -03:00
committed by Chris Hennes
parent ddf925afde
commit 52e4581130
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Mod/Fem/femtaskpanels/base_femmeshtaskpanel.py
View File

@@ -29,7 +29,6 @@ __url__ = "https://www.freecad.org"
# \ingroup FEM
# \brief base task panel for mesh object
import time
from abc import ABC, abstractmethod
from PySide import QtCore
@@ -79,6 +78,11 @@ class _BaseMeshTaskPanel(base_femtaskpanel._BaseTaskPanel, ABC):
QtCore.SIGNAL("finished(int,QProcess::ExitStatus)"),
self.process_finished,
)
QtCore.QObject.connect(
self.tool.process,
QtCore.SIGNAL("finished(int,QProcess::ExitStatus)"),
self.stop_timer,
)
QtCore.QObject.connect(
self.tool.process,
QtCore.SIGNAL("readyReadStandardOutput()"),
@@ -171,7 +175,6 @@ class _BaseMeshTaskPanel(base_femtaskpanel._BaseTaskPanel, ABC):
QtGui.QApplication.restoreOverrideCursor()
if self.tool.process.state() != QtCore.QProcess.ProcessState.NotRunning:
self.tool.process.kill()
self._thread.quit()
FreeCAD.Console.PrintWarning("Process aborted\n")
else:
return super().reject()
@@ -189,19 +192,17 @@ class _BaseMeshTaskPanel(base_femtaskpanel._BaseTaskPanel, ABC):
self.run_mesher()
def update_timer_text(self):
if (
self._thread.isRunning()
or self.tool.process.state() != QtCore.QProcess.ProcessState.NotRunning
):
self.text_time.setText(f"Time: {time.time() - self.time_start:4.1f}")
else:
self.timer.stop()
QtGui.QApplication.restoreOverrideCursor()
self.text_time.setText(f"Time: {self.elapsed.elapsed()/1000:4.1f} s")
def stop_timer(self, code, status):
self.timer.stop()
QtGui.QApplication.restoreOverrideCursor()
def run_mesher(self):
self.elapsed = QtCore.QElapsedTimer()
self.elapsed.start()
self.update_timer_text()
self.timer.start(100)
self.time_start = time.time()
self.text_time.setText(f"Time: {time.time() - self.time_start:4.1f}: ")
self._thread.start()