diff --git a/src/octoprint/static/js/app/viewmodels/gcode.js b/src/octoprint/static/js/app/viewmodels/gcode.js index e51592f5..c7aabdd1 100644 --- a/src/octoprint/static/js/app/viewmodels/gcode.js +++ b/src/octoprint/static/js/app/viewmodels/gcode.js @@ -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("
")); diff --git a/src/octoprint/static/js/app/viewmodels/printerstate.js b/src/octoprint/static/js/app/viewmodels/printerstate.js index f0696e92..ddbfc9ac 100644 --- a/src/octoprint/static/js/app/viewmodels/printerstate.js +++ b/src/octoprint/static/js/app/viewmodels/printerstate.js @@ -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() {