GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 06:09:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add total cost to the output overview.

Browse Source 
This fixes #5529
This commit is contained in:
Jaime van Kessel 2019-04-02 11:09:12 +02:00
parent 8b28dfb5e2
commit 8ae0c695bd
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
resources/qml/ActionPanel/OutputProcessWidget.qml
View File

@ -68,6 +68,7 @@ Column
property var printMaterialLengths: PrintInformation.materialLengths property var printMaterialLengths: PrintInformation.materialLengths
property var printMaterialWeights: PrintInformation.materialWeights property var printMaterialWeights: PrintInformation.materialWeights
property var printMaterialCosts: PrintInformation.materialCosts
text: text:
{ {
@ -77,6 +78,7 @@ Column
} }
var totalLengths = 0 var totalLengths = 0
var totalWeights = 0 var totalWeights = 0
var totalCosts = 0.0
if (printMaterialLengths) if (printMaterialLengths)
{ {
for(var index = 0; index < printMaterialLengths.length; index++) for(var index = 0; index < printMaterialLengths.length; index++)
@ -85,9 +87,16 @@ Column
{ {
totalLengths += printMaterialLengths[index] totalLengths += printMaterialLengths[index]
totalWeights += Math.round(printMaterialWeights[index]) totalWeights += Math.round(printMaterialWeights[index])
var cost = printMaterialCosts[index] == undefined ? 0.0 : printMaterialCosts[index]
totalCosts += cost
} }
} }
} }
if(totalCosts > 0)
{
var costString = "%1 %2".arg(UM.Preferences.getValue("cura/currency")).arg(totalCosts.toFixed(2))
return totalWeights + "g · " + totalLengths.toFixed(2) + "m · " + costString
}
return totalWeights + "g · " + totalLengths.toFixed(2) + "m" return totalWeights + "g · " + totalLengths.toFixed(2) + "m"
} }
source: UM.Theme.getIcon("spool") source: UM.Theme.getIcon("spool")