|
@@ -4,15 +4,12 @@
|
|
|
from UM.Logger import Logger
|
|
|
|
|
|
import cura.CuraApplication # Imported this way to prevent circular references.
|
|
|
+from cura.Machines.ContainerTree import ContainerTree
|
|
|
from cura.Machines.Models.QualityProfilesDropDownMenuModel import QualityProfilesDropDownMenuModel
|
|
|
-from cura.Machines.QualityManager import QualityManager
|
|
|
|
|
|
-
|
|
|
-#
|
|
|
-# This model is used for the custom profile items in the profile drop down menu.
|
|
|
-#
|
|
|
+## This model is used for the custom profile items in the profile drop down
|
|
|
+# menu.
|
|
|
class CustomQualityProfilesDropDownMenuModel(QualityProfilesDropDownMenuModel):
|
|
|
-
|
|
|
def _update(self):
|
|
|
Logger.log("d", "Updating {model_class_name}.".format(model_class_name = self.__class__.__name__))
|
|
|
|
|
@@ -22,12 +19,14 @@ class CustomQualityProfilesDropDownMenuModel(QualityProfilesDropDownMenuModel):
|
|
|
Logger.log("d", "No active GlobalStack, set %s as empty.", self.__class__.__name__)
|
|
|
return
|
|
|
|
|
|
- quality_changes_group_dict = QualityManager.getInstance().getQualityChangesGroups(active_global_stack)
|
|
|
+ variant_names = [extruder.variant.getName() for extruder in active_global_stack.extruders.values()]
|
|
|
+ material_bases = [extruder.material.getMetaDataEntry("base_file") for extruder in active_global_stack.extruders.values()]
|
|
|
+ extruder_enabled = [extruder.isEnabled for extruder in active_global_stack.extruders.values()]
|
|
|
+ machine_node = ContainerTree.getInstance().machines[active_global_stack.definition.getId()]
|
|
|
+ quality_changes_list = machine_node.getQualityChangesGroups(variant_names, material_bases, extruder_enabled)
|
|
|
|
|
|
item_list = []
|
|
|
- for key in sorted(quality_changes_group_dict, key = lambda name: name.upper()):
|
|
|
- quality_changes_group = quality_changes_group_dict[key]
|
|
|
-
|
|
|
+ for quality_changes_group in sorted(quality_changes_list, key = lambda qgc: qgc.name.lower()):
|
|
|
item = {"name": quality_changes_group.name,
|
|
|
"layer_height": "",
|
|
|
"layer_height_without_unit": "",
|
|
@@ -36,4 +35,4 @@ class CustomQualityProfilesDropDownMenuModel(QualityProfilesDropDownMenuModel):
|
|
|
|
|
|
item_list.append(item)
|
|
|
|
|
|
- self.setItems(item_list)
|
|
|
+ self.setItems(item_list)
|