lifning/ws4kp
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix current conditions close #3

Browse source
This commit is contained in:
Matt Walsh 2020-09-04 13:38:58 -05:00
parent 8bc7a7dd95
commit 6a079a5076
3 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
server/scripts/modules/currentweather.js
View file

@ -91,17 +91,6 @@ class CurrentWeather extends WeatherDisplay {
WindGust = utils.units.kphToMph(WindGust); WindGust = utils.units.kphToMph(WindGust);
} }
// get main icon
this.gifs.push(await utils.image.superGifAsync({
src: Icon,
loop_delay: 100,
auto_play: true,
canvas: this.canvas,
x: 140,
y: 175,
max_width: 126,
}));
this.context.drawImage(await this.backgroundImage, 0, 0); this.context.drawImage(await this.backgroundImage, 0, 0);
draw.horizontalGradientSingle(this.context, 0, 30, 500, 90, draw.topColor1, draw.topColor2); draw.horizontalGradientSingle(this.context, 0, 30, 500, 90, draw.topColor1, draw.topColor2);
draw.triangle(this.context, 'rgb(28, 10, 87)', 500, 30, 450, 90, 500, 90); draw.triangle(this.context, 'rgb(28, 10, 87)', 500, 30, 450, 90, 500, 90);
@ -177,6 +166,18 @@ class CurrentWeather extends WeatherDisplay {
draw.text(this.context, 'Star4000 Large', 'bold 16pt', '#FFFFFF', 340, 365, 'Wind Chill:', 2); draw.text(this.context, 'Star4000 Large', 'bold 16pt', '#FFFFFF', 340, 365, 'Wind Chill:', 2);
draw.text(this.context, 'Star4000 Large', 'bold 16pt', '#FFFFFF', 560, 365, WindChill + String.fromCharCode(176), 2, 'right'); draw.text(this.context, 'Star4000 Large', 'bold 16pt', '#FFFFFF', 560, 365, WindChill + String.fromCharCode(176), 2, 'right');
} }
// get main icon
this.gifs.push(await utils.image.superGifAsync({
src: Icon,
loop_delay: 100,
auto_play: true,
canvas: this.canvas,
x: 140,
y: 175,
max_width: 126,
}));
this.finishDraw(); this.finishDraw();
this.setStatus(STATUS.loaded); this.setStatus(STATUS.loaded);
} }

10
server/scripts/modules/weatherdisplay.js
View file

@ -91,7 +91,7 @@ class WeatherDisplay {
if (this.elemId === 'almanacTides') OkToDrawNoaaImage = false; if (this.elemId === 'almanacTides') OkToDrawNoaaImage = false;
if (this.elemId === 'outlook') OkToDrawNoaaImage = false; if (this.elemId === 'outlook') OkToDrawNoaaImage = false;
if (this.elemId === 'marineForecast')OkToDrawNoaaImage = false; if (this.elemId === 'marineForecast')OkToDrawNoaaImage = false;
if (this.elemId === 'airQuailty') OkToDrawNoaaImage = false; if (this.elemId === 'airQuality') OkToDrawNoaaImage = false;
if (this.elemId === 'travelForecast') OkToDrawNoaaImage = false; if (this.elemId === 'travelForecast') OkToDrawNoaaImage = false;
if (this.elemId === 'regionalForecast1')OkToDrawNoaaImage = false; if (this.elemId === 'regionalForecast1')OkToDrawNoaaImage = false;
if (this.elemId === 'regionalForecast2') OkToDrawNoaaImage = false; if (this.elemId === 'regionalForecast2') OkToDrawNoaaImage = false;
@ -135,7 +135,11 @@ class WeatherDisplay {
// on the first pass store the background for the date and time // on the first pass store the background for the date and time
if (!this.dateTimeBackground) { if (!this.dateTimeBackground) {
this.dateTimeBackground = this.context.getImageData(410, 30, 175, 60); const bg = this.context.getImageData(410, 30, 175, 60);
// test background draw complete and skip drawing if there is no background yet
if (bg.data[0] === 0) return;
// store the background
this.dateTimeBackground = bg;
} }
// Clear the date and time area. // Clear the date and time area.
@ -212,7 +216,7 @@ class WeatherDisplay {
// reset timing // reset timing
this.startNavCount(navigation.isPlaying()); this.startNavCount(navigation.isPlaying());
// refresh the canvas (incase the screen index chagned) // refresh the canvas (incase the screen index changed)
if (navCmd) this.drawCanvas(); if (navCmd) this.drawCanvas();
} }
hideCanvas() { hideCanvas() {

3
ws4kp.code-workspace
View file

@ -7,7 +7,8 @@
"settings": { "settings": {
"cSpell.enabled": true, "cSpell.enabled": true,
"cSpell.words": [ "cSpell.words": [
"Battaglia" "Battaglia",
"Noaa"
], ],
} }
} }