Merge branch '2.1'

This commit is contained in:
Tim Kuipers 2016-05-13 12:19:19 +02:00
commit 883d138f67
3 changed files with 19 additions and 2 deletions

View file

@ -105,6 +105,9 @@ class CuraEngineBackend(Backend):
return [Preferences.getInstance().getValue("backend/location"), "connect", "127.0.0.1:{0}".format(self._port), "-j", json_path, "-vv"]
def close(self):
self._terminate() # Forcefully shutdown the backend.
## Emitted when we get a message containing print duration and material amount. This also implies the slicing has finished.
# \param time The amount of time the print will take.
# \param material_amount The amount of material the print will use.