GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-07 19:19:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3

Browse Source
This commit is contained in:
Diego Prado Gesto 2018-03-28 14:28:38 +02:00
commit 2820dd3729
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cura/Settings/MachineManager.py
View File

@ -1016,27 +1016,35 @@ class MachineManager(QObject):
def _setQualityChangesGroup(self, quality_changes_group):
quality_type = quality_changes_group.quality_type
quality_group_dict = self._quality_manager.getQualityGroups(self._global_container_stack)
quality_group = quality_group_dict[quality_type]
# A custom quality can be created based on "not supported".
# In that case, do not set quality containers to empty.
if quality_type == "not_supported":
quality_group = None
else:
quality_group_dict = self._quality_manager.getQualityGroups(self._global_container_stack)
quality_group = quality_group_dict[quality_type]
quality_changes_container = self._empty_quality_changes_container
quality_container = self._empty_quality_changes_container
if quality_changes_group.node_for_global:
quality_changes_container = quality_changes_group.node_for_global.getContainer()
if quality_group.node_for_global:
quality_container = quality_group.node_for_global.getContainer()
quality_container = self._empty_quality_changes_container
if quality_group is not None:
if quality_group.node_for_global:
quality_container = quality_group.node_for_global.getContainer()
self._global_container_stack.quality = quality_container
self._global_container_stack.qualityChanges = quality_changes_container
for position, extruder in self._global_container_stack.extruders.items():
quality_changes_node = quality_changes_group.nodes_for_extruders.get(position)
quality_node = quality_group.nodes_for_extruders.get(position)
quality_node = None
if quality_group is not None:
quality_node = quality_group.nodes_for_extruders.get(position)
quality_changes_container = self._empty_quality_changes_container
quality_container = self._empty_quality_container
if quality_changes_node:
quality_changes_container = quality_changes_node.getContainer()
quality_container = self._empty_quality_container
if quality_node:
quality_container = quality_node.getContainer()