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

FEM: source typos

Browse Source
This commit is contained in:
Unknown
2017-12-31 12:22:16 +01:00
committed by wmayer
parent 93dd48dc6a
commit 34b485b648
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Mod/Fem/PyGui/_TaskPanelFemSolverControl.py
View File

@@ -45,7 +45,7 @@ class ControlTaskPanel(QtCore.QObject):
machineChanged = QtCore.Signal(object)
machineStarted = QtCore.Signal(object)
machineStoped = QtCore.Signal(object)
machineStopped = QtCore.Signal(object)
machineStatusChanged = QtCore.Signal(str)
machineStatusCleared = QtCore.Signal()
machineTimeChanged = QtCore.Signal(float)
@@ -79,9 +79,9 @@ class ControlTaskPanel(QtCore.QObject):
# Connect all proxy signals.
self.machineStarted.connect(self._timer.start)
self.machineStarted.connect(self.form.updateState)
self.machineStoped.connect(self._timer.stop)
self.machineStoped.connect(self._displayReport)
self.machineStoped.connect(self.form.updateState)
self.machineStopped.connect(self._timer.stop)
self.machineStopped.connect(self._displayReport)
self.machineStopped.connect(self.form.updateState)
self.machineStatusChanged.connect(self.form.appendStatus)
self.machineStatusCleared.connect(self.form.clearStatus)
self.machineTimeChanged.connect(self.form.setTime)
@@ -162,7 +162,7 @@ class ControlTaskPanel(QtCore.QObject):
machine.signalStatus.add(self._statusProxy)
machine.signalStatusCleared.add(self._statusClearedProxy)
machine.signalStarted.add(self._startedProxy)
machine.signalStoped.add(self._stopedProxy)
machine.signalStopped.add(self._stoppedProxy)
machine.signalState.add(self._stateProxy)
def _disconnectMachine(self):
@@ -170,14 +170,14 @@ class ControlTaskPanel(QtCore.QObject):
self.machine.signalStatus.remove(self._statusProxy)
self.machine.signalStatusCleared.add(self._statusClearedProxy)
self.machine.signalStarted.remove(self._startedProxy)
self.machine.signalStoped.remove(self._stopedProxy)
self.machine.signalStopped.remove(self._stoppedProxy)
self.machine.signalState.remove(self._stateProxy)
def _startedProxy(self):
self.machineStarted.emit(self.machine)
def _stopedProxy(self):
self.machineStoped.emit(self.machine)
def _stoppedProxy(self):
self.machineStopped.emit(self.machine)
def _statusProxy(self, line):
self.machineStatusChanged.emit(line)

12
src/Mod/Fem/femsolver/task.py
View File

@@ -39,8 +39,8 @@ class Task(object):
self.report = None
self.signalStarting = set()
self.signalStarted = set()
self.signalStoping = set()
self.signalStoped = set()
self.signalStopping = set()
self.signalStopped = set()
self.signalAbort = set()
self.signalStatus = set()
self.signalStatusCleared = set()
@@ -51,10 +51,10 @@ class Task(object):
self._failed = False
self._status = []
def stoping():
def stopping():
self.stopTime = time.time()
self.running = False
self.signalStoping.add(stoping)
self.signalStopping.add(stopping)
@property
def time(self):
@@ -139,8 +139,8 @@ class Thread(Task):
def _attachObserver(self):
def waitForStop():
self._thread.join()
signal.notify(self.signalStoping)
signal.notify(self.signalStoped)
signal.notify(self.signalStopping)
signal.notify(self.signalStopped)
thread = threading.Thread(target=waitForStop)
thread.daemon = True
thread.start()