diff options
| author | Diego Prado Gesto <d.pradogesto@ultimaker.com> | 2017-09-21 17:28:50 +0300 |
|---|---|---|
| committer | Diego Prado Gesto <d.pradogesto@ultimaker.com> | 2017-09-21 17:28:50 +0300 |
| commit | e73e218c4e68e9b8554125c300099af77b25e14b (patch) | |
| tree | 8dec826c32905d26e4938c880724fe29f6e122b5 /cura/Settings | |
| parent | c6e589e7d9b5bedaf95e8d74f6128b2498cf7c1d (diff) | |
Detecting whether the profile is created for multiple extrusion printers or not - CURA-4327
Diffstat (limited to 'cura/Settings')
| -rw-r--r-- | cura/Settings/QualityAndUserProfilesModel.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/cura/Settings/QualityAndUserProfilesModel.py b/cura/Settings/QualityAndUserProfilesModel.py index b6ac3fb6d0..1fa45a5902 100644 --- a/cura/Settings/QualityAndUserProfilesModel.py +++ b/cura/Settings/QualityAndUserProfilesModel.py @@ -25,21 +25,30 @@ class QualityAndUserProfilesModel(ProfilesModel): machine_definition = quality_manager.getParentMachineDefinition(global_container_stack.getBottom())
quality_changes_list = quality_manager.findAllQualityChangesForMachine(machine_definition)
+ # Detecting if the machine has multiple extrusion
+ multiple_extrusion = False
# Get the list of extruders and place the selected extruder at the front of the list.
extruder_manager = ExtruderManager.getInstance()
active_extruder = extruder_manager.getActiveExtruderStack()
extruder_stacks = extruder_manager.getActiveExtruderStacks()
if active_extruder in extruder_stacks:
+ multiple_extrusion = True
extruder_stacks.remove(active_extruder)
extruder_stacks = [active_extruder] + extruder_stacks
# Fetch the list of useable qualities across all extruders.
# The actual list of quality profiles come from the first extruder in the extruder list.
- quality_list = QualityManager.getInstance().findAllUsableQualitiesForMachineAndExtruders(global_container_stack,
+ quality_list = quality_manager.findAllUsableQualitiesForMachineAndExtruders(global_container_stack,
extruder_stacks)
# Filter the quality_change by the list of available quality_types
quality_type_set = set([x.getMetaDataEntry("quality_type") for x in quality_list])
- filtered_quality_changes = [qc for qc in quality_changes_list if qc.getMetaDataEntry("quality_type") in quality_type_set and qc.getMetaDataEntry("extruder") is None]
+
+ if multiple_extrusion:
+ # If the printer has multiple extruders then quality changes related to the current extruder are kept
+ filtered_quality_changes = [qc for qc in quality_changes_list if qc.getMetaDataEntry("quality_type") in quality_type_set and qc.getMetaDataEntry("extruder") == active_extruder.definition.getId()]
+ else:
+ # If not, the quality changes of the global stack are selected
+ filtered_quality_changes = [qc for qc in quality_changes_list if qc.getMetaDataEntry("quality_type") in quality_type_set]
return quality_list + filtered_quality_changes
|