Merge branch 'master' into mypy_fixes

This commit is contained in:
Lipu Fei 2018-06-29 13:45:55 +02:00 committed by GitHub
commit dc8d9e0f96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
647 changed files with 271695 additions and 116029 deletions

View file

@ -219,7 +219,7 @@ class StartSliceJob(Job):
extruders_enabled = {position: stack.isEnabled for position, stack in CuraApplication.getInstance().getGlobalContainerStack().extruders.items()}
filtered_object_groups = []
has_model_with_disabled_extruders = False
associated_siabled_extruders = set()
associated_disabled_extruders = set()
for group in object_groups:
stack = CuraApplication.getInstance().getGlobalContainerStack()
skip_group = False
@ -228,15 +228,14 @@ class StartSliceJob(Job):
if not extruders_enabled[extruder_position]:
skip_group = True
has_model_with_disabled_extruders = True
associated_siabled_extruders.add(extruder_position)
break
associated_disabled_extruders.add(extruder_position)
if not skip_group:
filtered_object_groups.append(group)
if has_model_with_disabled_extruders:
self.setResult(StartJobResult.ObjectsWithDisabledExtruder)
associated_siabled_extruders = {str(c) for c in sorted([int(p) + 1 for p in associated_siabled_extruders])}
self.setMessage(", ".join(associated_siabled_extruders))
associated_disabled_extruders = [str(c) for c in sorted([int(p) + 1 for p in associated_disabled_extruders])]
self.setMessage(", ".join(associated_disabled_extruders))
return
# There are cases when there is nothing to slice. This can happen due to one at a time slicing not being