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

Fixed an error in the temp graph when not connected

Browse source
This commit is contained in:
Gina Häußge 2017-06-30 09:24:07 +02:00
parent ce4cf38547
commit 836fbef6d8
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/octoprint/static/js/app/helpers.js
View file

@ -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&deg;C (%.1f&deg;F)", temp, temp * 9 / 5 + 32);
} else {

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

@ -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]);