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

Display fuzzy time estimates in frontend

Browse source
This commit is contained in:
Gina Häußge 2016-07-05 13:15:20 +02:00
parent 6018bf8428
commit 93b247b088
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -435,7 +435,7 @@ $(function() {
} else {
var output = [];
output.push(gettext("Model size") + ": " + model.width.toFixed(2) + "mm × " + model.depth.toFixed(2) + "mm × " + model.height.toFixed(2) + "mm");
output.push(gettext("Estimated total print time") + ": " + formatDuration(model.printTime));
output.push(gettext("Estimated total print time") + ": " + formatFuzzyEstimation(model.printTime));
output.push(gettext("Estimated layer height") + ": " + model.layerHeight.toFixed(2) + gettext("mm"));
output.push(gettext("Layer count") + ": " + model.layersPrinted.toFixed(0) + " " + gettext("printed") + ", " + model.layersTotal.toFixed(0) + " " + gettext("visited"));
@ -472,7 +472,7 @@ $(function() {
}
}
}
output.push(gettext("Print time for layer") + ": " + formatDuration(layer.printTime));
output.push(gettext("Print time for layer") + ": " + formatFuzzyEstimation(layer.printTime));
self.ui_layerInfo(output.join("<br>"));

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

@ -51,9 +51,9 @@ $(function() {
self.estimatedPrintTimeString = ko.pureComputed(function() {
if (self.lastPrintTime())
return formatDuration(self.lastPrintTime());
return formatFuzzyEstimation(self.lastPrintTime());
if (self.estimatedPrintTime())
return formatDuration(self.estimatedPrintTime());
return formatFuzzyEstimation(self.estimatedPrintTime());
return "-";
});
self.byteString = ko.pureComputed(function() {