Fix: very small intervals in forecast chart have bad background color…

…s. Bump to version 1.32.0.
FelixdelasPozas · Jan 26, 2025 · 2c88b12 · 2c88b12
1 parent e7e9820
commit 2c88b12
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/AboutDialog.cpp b/AboutDialog.cpp
@@ -29,7 +29,7 @@
 #include <QDesktopServices>
 #include <QUrl>
 
-const QString AboutDialog::VERSION{"1.31.4"};
+const QString AboutDialog::VERSION{"1.32.0"};
 const QString COPYRIGHT{"Copyright (c) 2016-%1 Félix de las Pozas Álvarez"};
 
 //-----------------------------------------------------------------

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,8 +7,8 @@ project(TrayWeather)
 
 # Version Number
 set (TRAYWEATHER_VERSION_MAJOR 1)
-set (TRAYWEATHER_VERSION_MINOR 31)
-set (TRAYWEATHER_VERSION_PATCH 4)
+set (TRAYWEATHER_VERSION_MINOR 32)
+set (TRAYWEATHER_VERSION_PATCH 0)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

diff --git a/WeatherDialog.cpp b/WeatherDialog.cpp
@@ -1632,13 +1632,15 @@ QLinearGradient WeatherDialog::sunriseSunsetGradient(QDateTime begin, QDateTime
   std::set<unsigned long long> sunrises, sunsets;
   constexpr unsigned long long minuteMs = 15 * 60 * 1000;
 
+  QColor startColor = darkColor;
   for(int i = 0; i < m_forecast->size(); ++i)
   {
     const auto &entry = m_forecast->at(i);
     const auto [sunrise, sunset] = computeSunriseSunset(entry, m_config->longitude, m_config->latitude);
 
     sunrises.emplace(sunrise * 1000);
     sunsets.emplace(sunset * 1000);
+    if(startT >= sunrise*1000 && endT <= sunset*1000) startColor = lightColor;
   }
 
   for(const unsigned long long sunrise: sunrises)
@@ -1657,6 +1659,13 @@ QLinearGradient WeatherDialog::sunriseSunsetGradient(QDateTime begin, QDateTime
   std::sort(stops.begin(), stops.end(), sortStops);
   for(const auto &s: stops) plotAreaGradient.setColorAt(s.first, s.second);
 
+  // in case of very small intervals where stops are empty.
+  if(stops.isEmpty())
+  {
+    plotAreaGradient.setColorAt(0, startColor);
+    plotAreaGradient.setColorAt(1, startColor);
+  }
+
   return plotAreaGradient;
 }
 

diff --git a/readme.md b/readme.md
@@ -170,16 +170,16 @@ To the translation in your language. For example in Spanish it is:
 
 # Repository information
 
-**Version**: 1.31.4
+**Version**: 1.32.0
 
 **Status**: finished.
 
 **cloc statistics**
 
 | Language                     |files          |blank        |comment           |code  |
 |:-----------------------------|--------------:|------------:|-----------------:|-----:|
-| C++                          |  12           | 1332        |   526            | 6573 |
+| C++                          |  12           | 1335        |   527            | 6584 |
 | C/C++ Header                 |  12           |  419        |  1243            | 1282 |
 | HTML                         |   1           |   33        |     0            |  152 |
 | CMake                        |   1           |   19        |    12            |  129 |
-| **Total**                    | **26**        | **1803**    | **1781**         | **8136** |
+| **Total**                    | **26**        | **1806**    | **1782**         | **8147** |