From 2d109090bc29ab79af81322c3ac9f2fd92c4fa3a Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Mon, 30 Oct 2017 12:40:41 +0100
Subject: [PATCH] Show material name instead of extruder number

---
 cura/PrintInformation.py  | 10 ++++++++++
 resources/qml/Sidebar.qml |  5 ++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/cura/PrintInformation.py b/cura/PrintInformation.py
index f3b178c356..c709bec20a 100644
--- a/cura/PrintInformation.py
+++ b/cura/PrintInformation.py
@@ -56,6 +56,7 @@ class PrintInformation(QObject):
         self._material_lengths = []
         self._material_weights = []
         self._material_costs = []
+        self._material_names = []
 
         self._pre_sliced = False
 
@@ -139,6 +140,12 @@ class PrintInformation(QObject):
     def materialCosts(self):
         return self._material_costs
 
+    materialNamesChanged = pyqtSignal()
+
+    @pyqtProperty("QVariantList", notify = materialNamesChanged)
+    def materialNames(self):
+        return self._material_names
+
     def _onPrintDurationMessage(self, print_time, material_amounts):
 
         self._updateTotalPrintTimePerFeature(print_time)
@@ -170,6 +177,7 @@ class PrintInformation(QObject):
         self._material_lengths = []
         self._material_weights = []
         self._material_costs = []
+        self._material_names = []
 
         material_preference_values = json.loads(Preferences.getInstance().getValue("cura/material_settings"))
 
@@ -208,10 +216,12 @@ class PrintInformation(QObject):
             self._material_weights.append(weight)
             self._material_lengths.append(length)
             self._material_costs.append(cost)
+            self._material_names.append(material.getName())
 
         self.materialLengthsChanged.emit()
         self.materialWeightsChanged.emit()
         self.materialCostsChanged.emit()
+        self.materialNamesChanged.emit()
 
     def _onPreferencesChanged(self, preference):
         if preference != "cura/material_settings":
diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml
index 14179d388d..32dceb6078 100644
--- a/resources/qml/Sidebar.qml
+++ b/resources/qml/Sidebar.qml
@@ -30,6 +30,7 @@ Rectangle
     property variant printMaterialLengths: PrintInformation.materialLengths
     property variant printMaterialWeights: PrintInformation.materialWeights
     property variant printMaterialCosts: PrintInformation.materialCosts
+    property variant printMaterialNames: PrintInformation.materialNames
 
     color: UM.Theme.getColor("sidebar")
     UM.I18nCatalog { id: catalog; name:"cura"}
@@ -392,11 +393,13 @@ Rectangle
                 var costs = [];
                 var total_cost = 0;
                 var some_costs_known = false;
+                var names = [];
                 if(base.printMaterialLengths) {
                     for(var index = 0; index < base.printMaterialLengths.length; index++)
                     {
                         if(base.printMaterialLengths[index] > 0)
                         {
+                            names.push(base.printMaterialNames[index]);
                             lengths.push(base.printMaterialLengths[index].toFixed(2));
                             weights.push(String(Math.floor(base.printMaterialWeights[index])));
                             var cost = base.printMaterialCosts[index] == undefined ? 0 : base.printMaterialCosts[index].toFixed(2);
@@ -423,7 +426,7 @@ Rectangle
                 for(var index = 0; index < lengths.length; index++)
                 {
                     var item_strings = [
-                        catalog.i18nc("@label", "Extruder %1:").arg(index + 1),
+                        "%1:".arg(names[index]),
                         catalog.i18nc("@label m for meter", "%1m").arg(lengths[index]),
                         catalog.i18nc("@label g for grams", "%1g").arg(weights[index]),
                         "%1 %2".arg(UM.Preferences.getValue("cura/currency")).arg(costs[index]),