From 08f2143790b6e2e44a4a4c3b072787c08c9822d1 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 7 Jul 2016 23:58:14 +0200 Subject: [PATCH] Simplify showing each material length individually CURA-1687 --- resources/qml/JobSpecs.qml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/resources/qml/JobSpecs.qml b/resources/qml/JobSpecs.qml index b2ba575761..db58b5ee4e 100644 --- a/resources/qml/JobSpecs.qml +++ b/resources/qml/JobSpecs.qml @@ -194,17 +194,15 @@ Rectangle { color: UM.Theme.getColor("text_subtext") text: { - var material_lengths; + var amounts = []; if(base.printMaterialAmounts) { - material_lengths = "" for(var index = 0; index < base.printMaterialAmounts.length; index++) { - material_lengths += base.printMaterialAmounts[index].toFixed(2).toString() + " + " + amounts.push(base.printMaterialAmounts[index].toFixed(2)); } - material_lengths = material_lengths.substr(0, material_lengths.length - 3) } else { - material_lengths = "0.00" + amounts = ["0.00"]; } - return catalog.i18nc("@label", "%1 m").arg(material_lengths) + return catalog.i18nc("@label", "%1 m").arg(amounts.join(" + ")); } } }