mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-11 00:37:50 -06:00
Fix issues caused by merge
This commit is contained in:
parent
49a510b03c
commit
462b68f389
1 changed files with 2 additions and 2 deletions
|
@ -39,7 +39,7 @@ class CuraEngineBackend(Backend):
|
||||||
self._change_timer = QTimer()
|
self._change_timer = QTimer()
|
||||||
self._change_timer.setInterval(500)
|
self._change_timer.setInterval(500)
|
||||||
self._change_timer.setSingleShot(True)
|
self._change_timer.setSingleShot(True)
|
||||||
self._change_timer.timeout.connect(self._onChangeTimerFinished)
|
self._change_timer.timeout.connect(self.slice)
|
||||||
|
|
||||||
self._message_handlers[Cura_pb2.SlicedObjectList] = self._onSlicedObjectListMessage
|
self._message_handlers[Cura_pb2.SlicedObjectList] = self._onSlicedObjectListMessage
|
||||||
self._message_handlers[Cura_pb2.Progress] = self._onProgressMessage
|
self._message_handlers[Cura_pb2.Progress] = self._onProgressMessage
|
||||||
|
@ -213,7 +213,7 @@ class CuraEngineBackend(Backend):
|
||||||
if not self._settings:
|
if not self._settings:
|
||||||
return
|
return
|
||||||
|
|
||||||
self._changeTimer.start()
|
self._change_timer.start()
|
||||||
|
|
||||||
## TODO: Neith settings need to be moved to their own backend.
|
## TODO: Neith settings need to be moved to their own backend.
|
||||||
def _sendSettings(self, settings):
|
def _sendSettings(self, settings):
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue