3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 02:37:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Rapid succesion of tool operations no longer freeze interface on Ubuntu

Browse source 
CURA-2158
This commit is contained in:
Jaime van Kessel 2016-08-23 11:50:28 +02:00
parent 344be2687e
commit e495534219
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/CuraEngineBackend/CuraEngineBackend.py
View file

@ -127,7 +127,6 @@ class CuraEngineBackend(Backend):
def close(self): def close(self):
# Terminate CuraEngine if it is still running at this point # Terminate CuraEngine if it is still running at this point
self._terminate() self._terminate()
super().close()
## Get the command that is used to call the engine. ## Get the command that is used to call the engine.
# This is useful for debugging and used to actually start the engine. # This is useful for debugging and used to actually start the engine.
@ -195,6 +194,7 @@ class CuraEngineBackend(Backend):
self.slicingCancelled.emit() self.slicingCancelled.emit()
self.processingProgress.emit(0) self.processingProgress.emit(0)
Logger.log("d", "Attempting to kill the engine process") Logger.log("d", "Attempting to kill the engine process")
if self._enabled:
self._createSocket() # Ensure that we have a fresh socket. self._createSocket() # Ensure that we have a fresh socket.
if Application.getInstance().getCommandLineOption("external-backend", False): if Application.getInstance().getCommandLineOption("external-backend", False):
return return
@ -374,8 +374,9 @@ class CuraEngineBackend(Backend):
# #
# \param tool The tool that the user is using. # \param tool The tool that the user is using.
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'
self._terminate() # Do not continue slicing once a tool has started
## Called when the user stops using some tool. ## Called when the user stops using some tool.
# #
@ -384,6 +385,7 @@ class CuraEngineBackend(Backend):
# \param tool The tool that the user was using. # \param tool The tool that the user was using.
def _onToolOperationStopped(self, tool): def _onToolOperationStopped(self, tool):
self._enabled = True # Tool stop, start listening for changes again. self._enabled = True # Tool stop, start listening for changes again.
self._terminate()
## Called when the user changes the active view mode. ## Called when the user changes the active view mode.
def _onActiveViewChanged(self): def _onActiveViewChanged(self):
@ -407,7 +409,6 @@ class CuraEngineBackend(Backend):
if not self._restart and self._process: if not self._restart and self._process:
Logger.log("d", "Backend quit with return code %s. Resetting process and socket.", self._process.wait()) Logger.log("d", "Backend quit with return code %s. Resetting process and socket.", self._process.wait())
self._process = None self._process = None
self._createSocket()
## Called when the global container stack changes ## Called when the global container stack changes
def _onGlobalStackChanged(self): def _onGlobalStackChanged(self):