pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

If a tool did not extrude anything, skip it in the filament usage summary

Browse source 
Also targets #539
This commit is contained in:
Gina Häußge 2014-08-11 18:26:33 +02:00
parent 6c5b32d92b
commit dffa00dc5e
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/octoprint/static/js/app/viewmodels/files.js
View file

@ -277,7 +277,9 @@ function GcodeFilesViewModel(printerStateViewModel, loginStateViewModel) {
} else { } else {
var i = 0; var i = 0;
do { do {
output += "Filament (Tool " + i + "): " + formatFilament(data["gcodeAnalysis"]["filament"]["tool" + i]) + "<br>"; if (filament["tool" + i].hasOwnProperty("length") && filament["tool" + i]["length"] > 0) {
output += "Filament (Tool " + i + "): " + formatFilament(filament["tool" + i]) + "<br>";
}
i++; i++;
} while (filament.hasOwnProperty("tool" + i)); } while (filament.hasOwnProperty("tool" + i));
} }

6
src/octoprint/static/js/app/viewmodels/printerstate.js
View file

@ -133,10 +133,12 @@ function PrinterStateViewModel(loginStateViewModel) {
var i = 0; var i = 0;
do { do {
var key = "tool" + i; var key = "tool" + i;
result[i] = { if (data.filament[key].hasOwnProperty("length") && data.filament[key].length > 0) {
result.push({
name: ko.observable("Tool " + i), name: ko.observable("Tool " + i),
data: ko.observable(data.filament[key]) data: ko.observable(data.filament[key])
}; });
}
i++; i++;
} while (data.filament.hasOwnProperty("tool" + i)); } while (data.filament.hasOwnProperty("tool" + i));
} }