From 7964465eb52ae2cb72ad3fd6f16ef56647f6b168 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 1 Feb 2019 11:05:44 +0100 Subject: [PATCH 1/2] UM2+ do not support olsson block upgrade CURA-6133 --- resources/definitions/ultimaker2_plus.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json index bf48353f59..28fd2b71f9 100644 --- a/resources/definitions/ultimaker2_plus.def.json +++ b/resources/definitions/ultimaker2_plus.def.json @@ -15,6 +15,7 @@ "has_machine_materials": true, "has_machine_quality": true, "first_start_actions": [], + "supported_actions": [], "machine_extruder_trains": { "0": "ultimaker2_plus_extruder_0" From bac344a692d4feb8455482237101aaae165dd9f4 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 5 Feb 2019 09:26:47 +0100 Subject: [PATCH 2/2] Show extruder names in disabled message CURA-5693 --- cura/Settings/MachineManager.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index e07cacaa9d..d69219c7b1 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1400,8 +1400,7 @@ class MachineManager(QObject): self._global_container_stack.extruders[position].setEnabled(False) need_to_show_message = True - # In message, we need to show Extruder 1, 2, 3 instead of 0, 1, 2 - disabled_used_extruder_position_set.add(int(position) + 1) + disabled_used_extruder_position_set.add(int(position)) else: variant_container_node = self._variant_manager.getVariantNode(self._global_container_stack.definition.getId(), @@ -1434,8 +1433,15 @@ class MachineManager(QObject): self._updateQualityWithMaterial() if need_to_show_message: - msg_str = "Extruder {extruders} is disabled because there is no material loaded. Please load a material or use custom configurations." - extruders_str = ", ".join(str(x) for x in sorted(disabled_used_extruder_position_set)) + msg_str = "{extruders} is disabled because there is no material loaded. Please load a material or use custom configurations." + + # Show human-readable extruder names such as "Extruder Left", "Extruder Front" instead of "Extruder 1, 2, 3". + extruder_names = [] + for position in sorted(disabled_used_extruder_position_set): + extruder_stack = self._global_container_stack.extruders[str(position)] + extruder_name = extruder_stack.definition.getName() + extruder_names.append(extruder_name) + extruders_str = ", ".join(extruder_names) msg_str = msg_str.format(extruders = extruders_str) message = Message(catalog.i18nc("@info:status", msg_str), title = catalog.i18nc("@info:title", "Extruder(s) Disabled"))