3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 14:44:13 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Use the new generator to simplify some extruder related code in MachineManager

Browse source 
Contributes to CURA-2006
This commit is contained in:
Arjen Hiemstra 2016-08-11 17:50:08 +02:00
parent 6049d6f3a5
commit 9f33fef4ec
1 changed files with 5 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

22
cura/Settings/MachineManager.py
View file

@ -401,25 +401,15 @@ class MachineManager(QObject):
result = {} result = {}
stacks = [ s for s in ExtruderManager.getInstance().getMachineExtruders(self._global_container_stack.getId()) ] for stack in ExtruderManager.getInstance().getActiveGlobalAndExtruderStacks():
stacks.insert(0, self._global_container_stack)
for stack in stacks:
material_container = stack.findContainer(type = "material") material_container = stack.findContainer(type = "material")
if not material_container: if not material_container:
continue continue
key = "" result[stack.getId()] = material_container.getId()
if stack == self._global_container_stack:
key = "global"
else:
key = stack.getId()
result[key] = material_container.getId()
return result return result
@pyqtProperty(str, notify=activeQualityChanged) @pyqtProperty(str, notify=activeQualityChanged)
def activeQualityName(self): def activeQualityName(self):
if self._active_container_stack: if self._active_container_stack:
@ -549,10 +539,7 @@ class MachineManager(QObject):
if not quality_type: if not quality_type:
quality_type = quality_changes_container.getName() quality_type = quality_changes_container.getName()
stacks = [ s for s in ExtruderManager.getInstance().getMachineExtruders(self._global_container_stack.getId()) ] for stack in ExtruderManager.getInstance().getActiveGlobalAndExtruderStacks():
stacks.insert(0, self._global_container_stack)
for stack in stacks:
extruder_id = stack.getId() if stack != self._global_container_stack else None extruder_id = stack.getId() if stack != self._global_container_stack else None
criteria = { "quality_type": quality_type, "extruder": extruder_id } criteria = { "quality_type": quality_type, "extruder": extruder_id }
@ -567,7 +554,8 @@ class MachineManager(QObject):
stack_quality = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(**criteria) stack_quality = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(**criteria)
if not stack_quality: if not stack_quality:
stack_quality = quality_container stack_quality = quality_container
stack_quality = stack_quality[0] else:
stack_quality = stack_quality[0]
else: else:
stack_quality = stack_quality[0] stack_quality = stack_quality[0]