GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 20:39:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #575 from fieldOfView/feature_tool_stops_engine

Browse Source 
Terminate engine when a ToolOperation starts
This commit is contained in:
Ghostkeeper 2015-12-22 10:41:48 +01:00
commit 345775fc2a
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
plugins/CuraEngineBackend/CuraEngineBackend.py
View File

@ -107,15 +107,7 @@ class CuraEngineBackend(Backend):
return return
if self._slicing: if self._slicing:
self._slicing = False self._terminate()
self._restart = True
if self._process is not None:
Logger.log("d", "Killing engine process")
try:
self._process.terminate()
except: # terminating a process that is already terminating causes an exception, silently ignore this.
pass
if self._message: if self._message:
self._message.hide() self._message.hide()
@ -147,6 +139,16 @@ class CuraEngineBackend(Backend):
job.start() job.start()
job.finished.connect(self._onStartSliceCompleted) job.finished.connect(self._onStartSliceCompleted)
def _terminate(self):
self._slicing = False
self._restart = True
if self._process is not None:
Logger.log("d", "Killing engine process")
try:
self._process.terminate()
except: # terminating a process that is already terminating causes an exception, silently ignore this.
pass
def _onStartSliceCompleted(self, job): def _onStartSliceCompleted(self, job):
if job.getError() or job.getResult() != True: if job.getError() or job.getResult() != True:
if self._message: if self._message:
@ -245,6 +247,7 @@ class CuraEngineBackend(Backend):
self._restart = False self._restart = False
def _onToolOperationStarted(self, tool): def _onToolOperationStarted(self, tool):
self._terminate() # Do not continue slicing once a tool has started
self._enabled = False # Do not reslice when a tool is doing it's 'thing' self._enabled = False # Do not reslice when a tool is doing it's 'thing'
def _onToolOperationStopped(self, tool): def _onToolOperationStopped(self, tool):
@ -265,12 +268,5 @@ class CuraEngineBackend(Backend):
def _onInstanceChanged(self): def _onInstanceChanged(self):
self._slicing = False self._terminate()
self._restart = True
if self._process is not None:
Logger.log("d", "Killing engine process")
try:
self._process.terminate()
except: # terminating a process that is already terminating causes an exception, silently ignore this.
pass
self.slicingCancelled.emit() self.slicingCancelled.emit()