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

Show extruder names in disabled message

Browse Source 
CURA-5693
This commit is contained in:
Lipu Fei 2019-02-05 09:26:47 +01:00
parent 7964465eb5
commit bac344a692
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cura/Settings/MachineManager.py
View File

@ -1400,8 +1400,7 @@ class MachineManager(QObject):
self._global_container_stack.extruders[position].setEnabled(False) self._global_container_stack.extruders[position].setEnabled(False)
need_to_show_message = True 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))
disabled_used_extruder_position_set.add(int(position) + 1)
else: else:
variant_container_node = self._variant_manager.getVariantNode(self._global_container_stack.definition.getId(), variant_container_node = self._variant_manager.getVariantNode(self._global_container_stack.definition.getId(),
@ -1434,8 +1433,15 @@ class MachineManager(QObject):
self._updateQualityWithMaterial() self._updateQualityWithMaterial()
if need_to_show_message: 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." msg_str = "{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))
# 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) msg_str = msg_str.format(extruders = extruders_str)
message = Message(catalog.i18nc("@info:status", msg_str), message = Message(catalog.i18nc("@info:status", msg_str),
title = catalog.i18nc("@info:title", "Extruder(s) Disabled")) title = catalog.i18nc("@info:title", "Extruder(s) Disabled"))