Add and show weather icons

CREDITS.md

@@ -0,0 +1,12 @@
+Credits
+=======
+
+This project would not be possible without
+
+- Weather Icon set by Laura Reen (thanks for the free high quality icons!)
+  - https://www.iconfinder.com/iconsets/the-weather-is-nice-today
+- Rapidjson (thanks for the fast json parser!) 
+  - https://rapidjson.org
+- libcurl (thanks for being the best and most reliable general purpose network
+  library!) 
+  - https://curl.se/libcurl/

src/config.cpp

@@ -22,10 +22,28 @@ dashboard::panel::panel* OVERLAY = new dashboard::panel::def_overlay();
 // Locations of all static images used
 const char* IMAGE_LOCATIONS[] = {
     //"bmp_24.png",
-    "wifi.png",
 
-    "weather_background.png",
+    //wifi
+    "wifi.png",
     "wifi_background.jpg",
+
+    //weather
+    "weather_background.png",
+    "clearday.png",
+    "clearnight.png",
+    "cloudyday.png",
+    "cloudynight.png",
+    "humidday.png",
+    "humidnight.png",
+    "lrainday.png",
+    "lrainnight.png",
+    "rainday.png",
+    "rainnight.png",
+    "rainsnow.png",
+    "shower.png",
+    "snowday.png",
+    "snownight.png",
+    
 };
 size_t IMAGE_LOCATIONS_LENGTH = sizeof(IMAGE_LOCATIONS)/sizeof(IMAGE_LOCATIONS[0]);
 

src/panel/weather.cpp

@@ -170,6 +170,7 @@ void weather::update_texture(){
     SDL_RenderCopy(board::getRenderer(),
             board::getString(temp.c_str(),
                 { "Roboto_Mono/RobotoMono-Medium.ttf", 50 }), NULL, &tgt);
+
     
 
     //tommorow's weather
@@ -202,6 +203,16 @@ void weather::update_texture(){
     SDL_RenderCopy(board::getRenderer(),
             board::getString(temp.c_str(),
                 { "Roboto_Mono/RobotoMono-Medium.ttf", 50 }), NULL, &tgt);
+    //icon
+    tgt.w = (SCREEN_WIDTH / 3) - 50;
+    tgt.h = tgt.w;
+    tgt.y = DEF_OVERLAY_BAR_HEIGHT + 25;
+    tgt.x = 0;
+
+    SDL_RenderCopy(board::getRenderer(),
+            board::getImage(weather_tommorow->second),
+            NULL, &tgt);
+
 
     //day after's weather
     TTF_SizeText(board::getFont({ "Roboto_Mono/RobotoMono-Medium.ttf", 50 }),
@@ -233,8 +244,17 @@ void weather::update_texture(){
     SDL_RenderCopy(board::getRenderer(),
             board::getString(temp.c_str(),
                 { "Roboto_Mono/RobotoMono-Medium.ttf", 50 }), NULL, &tgt);
+    //icon
+    tgt.w = (SCREEN_WIDTH / 3) - 50;
+    tgt.h = tgt.w;
+    tgt.y = DEF_OVERLAY_BAR_HEIGHT + 25;
+    tgt.x = (2*SCREEN_WIDTH / 3);
+    std::cerr << "WEATHER DAY AFTER " << weather_day_after->second << "\n";
+    std::cerr << board::getImage(weather_day_after->second) << "\n";
 
-
+    SDL_RenderCopy(board::getRenderer(),
+            board::getImage(weather_day_after->second),
+            NULL, &tgt);
 
     SDL_SetRenderTarget(board::getRenderer(), NULL);
 }

src/panel/weather_config.hpp

@@ -8,6 +8,7 @@
 
 #include <utility>
 #include <string>
+#include "def_overlay_config.hpp"
 
 namespace dashboard::panel {
     //This will be displayed at the top left on the status bar. Set to a blank
@@ -41,14 +42,14 @@ namespace dashboard::panel {
         {"Clear skies", "clearnight.png"};
 
     const std::pair<std::string, std::string> WEATHER_PCLOUDY_DAY = 
-        {"Slightly cloudy", "pcloudyday.png"};
+        {"Slightly cloudy", "cloudyday.png"};
     const std::pair<std::string, std::string> WEATHER_PCLOUDY_NIGHT = 
-        {"Slightly cloudy", "pcloudynight.png"};
+        {"Slightly cloudy", "cloudynight.png"};
 
     const std::pair<std::string, std::string> WEATHER_MCLOUDY_DAY = 
-        {"Moderately cloudy", "mcloudyday.png"};
+        {"Moderately cloudy", "cloudyday.png"};
     const std::pair<std::string, std::string> WEATHER_MCLOUDY_NIGHT = 
-        {"Moderately cloudy", "mcloudynight.png"};
+        {"Moderately cloudy", "cloudynight.png"};
 
     const std::pair<std::string, std::string> WEATHER_CLOUDY_DAY = 
         {"Very cloudy", "cloudyday.png"};
@@ -71,19 +72,19 @@ namespace dashboard::panel {
         {"Rain", "rainnight.png"};
 
     const std::pair<std::string, std::string> WEATHER_OSHOWER_DAY = 
-        {"Overcast with showers", "oshowerday.png"};
+        {"Overcast with showers", "shower.png"};
     const std::pair<std::string, std::string> WEATHER_OSHOWER_NIGHT = 
-        {"Overcast with showers", "oshowernight.png"};
+        {"Overcast with showers", "shower.png"};
 
     const std::pair<std::string, std::string> WEATHER_ISHOWER_DAY = 
-        {"Moderate showers", "ishowerday.png"};
+        {"Moderate showers", "shower.png"};
     const std::pair<std::string, std::string> WEATHER_ISHOWER_NIGHT = 
-        {"Moderate showers", "ishowernight.png"};
+        {"Moderate showers", "shower.png"};
 
     const std::pair<std::string, std::string> WEATHER_LSNOW_DAY = 
-        {"Light snow", "lsnowday.png"};
+        {"Light snow", "snowday.png"};
     const std::pair<std::string, std::string> WEATHER_LSNOW_NIGHT =
-        {"Light snow", "lsnownight.png"};
+        {"Light snow", "snownight.png"};
 
     const std::pair<std::string, std::string> WEATHER_SNOW_DAY = 
         {"Moderate snow", "snowday.png"};
@@ -91,7 +92,7 @@ namespace dashboard::panel {
         {"Moderate snow", "snownight.png"};
 
     const std::pair<std::string, std::string> WEATHER_RAINSNOW_DAY =
-        {"Rain and snow", "rainsnowday.png"};
+        {"Rain and snow", "rainsnow.png"};
     const std::pair<std::string, std::string> WEATHER_RAINSNOW_NIGHT =
-        {"Rain and snow", "rainsnownight.png"};
+        {"Rain and snow", "rainsnow.png"};
 }