From 836fbef6d87d71d9a3f87234ccaad728be4fbfae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Fri, 30 Jun 2017 09:24:07 +0200 Subject: [PATCH] Fixed an error in the temp graph when not connected --- src/octoprint/static/js/app/helpers.js | 6 ++++-- src/octoprint/static/js/app/viewmodels/temperature.js | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/octoprint/static/js/app/helpers.js b/src/octoprint/static/js/app/helpers.js index 4845a3f6..01f3146d 100644 --- a/src/octoprint/static/js/app/helpers.js +++ b/src/octoprint/static/js/app/helpers.js @@ -524,12 +524,14 @@ function formatFilament(filament) { } function cleanTemperature(temp) { - if (!temp || temp < 10) return gettext("off"); + if (temp === undefined || !_.isNumber(temp)) return "-"; + if (temp < 10) return gettext("off"); return temp; } function formatTemperature(temp, showF) { - if (!temp || temp < 10) return gettext("off"); + if (temp === undefined || !_.isNumber(temp)) return "-"; + if (temp < 10) return gettext("off"); if (showF) { return _.sprintf("%.1f°C (%.1f°F)", temp, temp * 9 / 5 + 32); } else { diff --git a/src/octoprint/static/js/app/viewmodels/temperature.js b/src/octoprint/static/js/app/viewmodels/temperature.js index 0afaada8..4d9f5e3d 100644 --- a/src/octoprint/static/js/app/viewmodels/temperature.js +++ b/src/octoprint/static/js/app/viewmodels/temperature.js @@ -363,9 +363,11 @@ $(function() { var p1 = series.data[i - 1]; var p2 = series.data[i]; - if (p1 == undefined) { + if (p1 === undefined && p2 === undefined) { + y = undefined; + } else if (p1 === undefined) { y = p2[1]; - } else if (p2 == undefined) { + } else if (p2 === undefined) { y = p1[1]; } else { y = p1[1] + (p2[1] - p1[1]) * (pos.x - p1[0]) / (p2[0] - p1[0]);