diff --git a/cura/Machines/Models/NozzleModel.py b/cura/Machines/Models/NozzleModel.py index a5069f4fbd..da3d4728e5 100644 --- a/cura/Machines/Models/NozzleModel.py +++ b/cura/Machines/Models/NozzleModel.py @@ -26,7 +26,6 @@ class NozzleModel(ListModel): self._application = Application.getInstance() self._machine_manager = self._application.getMachineManager() - self._variant_manager = self._application.getVariantManager() self._machine_manager.globalContainerChanged.connect(self._update) self._update() @@ -40,19 +39,12 @@ class NozzleModel(ListModel): return machine_node = ContainerTree.getInstance().machines[global_stack.definition.getId()] - - has_variants = parseBool(global_stack.getMetaDataEntry("has_variants", False)) - if not has_variants: - self.setItems([]) - return - - variant_node_dict = self._variant_manager.getVariantNodes(global_stack, VariantType.NOZZLE) - if not variant_node_dict: + if not machine_node.has_variants: self.setItems([]) return item_list = [] - for hotend_name, container_node in sorted(variant_node_dict.items(), key = lambda i: i[0].upper()): + for hotend_name, container_node in sorted(machine_node.variants.items(), key = lambda i: i[0].upper()): item = {"id": hotend_name, "hotend_name": hotend_name, "container_node": container_node @@ -60,4 +52,4 @@ class NozzleModel(ListModel): item_list.append(item) - self.setItems(item_list) + self.setItems(item_list) \ No newline at end of file