3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

D6: Moved backend pausing to itself

Browse source
This commit is contained in:
Victor Larchenko 2016-12-13 13:58:33 +06:00 • committed by Youness Alaoui
parent b967f045fe
commit cb428c70de
2 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
cura/CuraApplication.py
View file

@ -585,16 +585,10 @@ class CuraApplication(QtApplication):
def updatePlatformActivity(self, node = None): def updatePlatformActivity(self, node = None):
count = 0 count = 0
scene_bounding_box = None scene_bounding_box = None
should_pause = False
for node in DepthFirstIterator(self.getController().getScene().getRoot()): for node in DepthFirstIterator(self.getController().getScene().getRoot()):
if type(node) is not SceneNode or (not node.getMeshData() and not node.callDecoration("isBlockSlicing")): if type(node) is not SceneNode or (not node.getMeshData() and not node.callDecoration("isBlockSlicing")):
continue continue
if node.callDecoration("isBlockSlicing"):
should_pause = True
gcode_list = node.callDecoration("getGCodeList")
if gcode_list is not None:
self.getController().getScene().gcode_list = gcode_list
count += 1 count += 1
if not scene_bounding_box: if not scene_bounding_box:
scene_bounding_box = node.getBoundingBox() scene_bounding_box = node.getBoundingBox()
@ -603,16 +597,6 @@ class CuraApplication(QtApplication):
if other_bb is not None: if other_bb is not None:
scene_bounding_box = scene_bounding_box + node.getBoundingBox() scene_bounding_box = scene_bounding_box + node.getBoundingBox()
print_information = self.getPrintInformation()
if should_pause:
self.getBackend().pauseSlicing()
if print_information:
print_information.setPreSliced(True)
else:
self.getBackend().continueSlicing()
if print_information:
print_information.setPreSliced(False)
if not scene_bounding_box: if not scene_bounding_box:
scene_bounding_box = AxisAlignedBox.Null scene_bounding_box = AxisAlignedBox.Null

22
plugins/CuraEngineBackend/CuraEngineBackend.py
View file

@ -12,6 +12,8 @@ from UM.PluginRegistry import PluginRegistry
from UM.Resources import Resources from UM.Resources import Resources
from UM.Settings.Validator import ValidatorState #To find if a setting is in an error state. We can't slice then. from UM.Settings.Validator import ValidatorState #To find if a setting is in an error state. We can't slice then.
from UM.Platform import Platform from UM.Platform import Platform
from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator
import cura.Settings import cura.Settings
@ -313,6 +315,26 @@ class CuraEngineBackend(Backend):
if source is self._scene.getRoot(): if source is self._scene.getRoot():
return return
application = Application.getInstance()
should_pause = False
for node in DepthFirstIterator(self._scene.getRoot()):
if node.callDecoration("isBlockSlicing"):
should_pause = True
gcode_list = node.callDecoration("getGCodeList")
if gcode_list is not None:
self._scene.gcode_list = gcode_list
print_information = application.getPrintInformation()
if should_pause:
self.pauseSlicing()
if print_information:
print_information.setPreSliced(True)
else:
self.continueSlicing()
if print_information:
print_information.setPreSliced(False)
if source.getMeshData() is None: if source.getMeshData() is None:
return return