From 68ee4f0ea113427a3507ebfc26e992ad04497fe0 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 21 Jun 2016 07:13:19 +0200 Subject: [PATCH] Format extrudername to include material name CURA-333 --- cura/ExtrudersModel.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cura/ExtrudersModel.py b/cura/ExtrudersModel.py index e4512210f6..a2a066690f 100644 --- a/cura/ExtrudersModel.py +++ b/cura/ExtrudersModel.py @@ -107,7 +107,10 @@ class ExtrudersModel(UM.Qt.ListModel.ListModel): self.appendItem(item) for extruder in manager.getMachineExtruders(global_container_stack.getBottom().getId()): + extruder_name = extruder.getName() material = extruder.findContainer({ "type": "material" }) + if material: + extruder_name = "%s (%s)" % (material.getName(), extruder_name) position = extruder.getBottom().getMetaDataEntry("position", default = "0") #Position in the definition. try: position = int(position) @@ -117,7 +120,7 @@ class ExtrudersModel(UM.Qt.ListModel.ListModel): colour = material.getMetaDataEntry("color_code", default = default_colour) if material else default_colour item = { #Construct an item with only the relevant information. "id": extruder.getId(), - "name": extruder.getName(), + "name": extruder_name, "colour": colour, "index": position }