Added progress handler for wind and HTTP downloads.

3.7.4.develop
albar965/littlenavmap#737

src/atools.cpp

@@ -34,7 +34,7 @@ const static QChar SEP(QDir::separator());
 
 QString version()
 {
-  return "3.7.3.develop"; // VERSION_NUMBER - atools
+  return "3.7.4.develop"; // VERSION_NUMBER - atools
 }
 
 QString gitRevision()

src/fs/weather/weatherdownloadbase.cpp

@@ -34,6 +34,8 @@ WeatherDownloadBase::WeatherDownloadBase(QObject *parent, MetarFormat format, bo
 
   connect(downloader, &atools::util::HttpDownloader::downloadSslErrors,
           this, &WeatherDownloadBase::weatherDownloadSslErrors);
+  connect(downloader, &atools::util::HttpDownloader::downloadProgress,
+          this, &WeatherDownloadBase::weatherDownloadProgress);
 
   errorStateTimer.setSingleShot(true);
   errorStateTimer.setInterval(180 * 1000);

src/fs/weather/weatherdownloadbase.h

@@ -89,6 +89,9 @@ class WeatherDownloadBase :
   /* Emitted on SSL errors. Call setIgnoreSslErrors to ignore future errors and continue.  */
   void weatherDownloadSslErrors(const QStringList& errors, const QString& downloadUrl);
 
+  /* Emitted during download */
+  void weatherDownloadProgress(qint64 bytesReceived, qint64 bytesTotal, QString downloadUrl);
+
 protected:
   virtual void startDownload();
 

src/grib/gribdownloader.cpp

@@ -42,6 +42,7 @@ GribDownloader::GribDownloader(QObject *parent, bool logVerbose = false)
   connect(downloader, &HttpDownloader::downloadFinished, this, &GribDownloader::downloadFinished);
   connect(downloader, &HttpDownloader::downloadFailed, this, &GribDownloader::downloadFailed);
   connect(downloader, &HttpDownloader::downloadSslErrors, this, &GribDownloader::gribDownloadSslErrors);
+  connect(downloader, &HttpDownloader::downloadProgress, this, &GribDownloader::gribDownloadProgress);
 }
 
 GribDownloader::~GribDownloader()

src/grib/gribdownloader.h

@@ -113,6 +113,8 @@ class GribDownloader :
   /* Emitted on SSL errors. Call setIgnoreSslErrors to ignore future errors and continue.  */
   void gribDownloadSslErrors(const QStringList& errors, const QString& downloadUrl);
 
+  void gribDownloadProgress(qint64 bytesReceived, qint64 bytesTotal, QString downloadUrl);
+
 private:
   void downloadFinished(const QByteArray& data, QString downloadUrl);
   void downloadFailed(const QString& error, int errorCode, QString downloadUrl);

src/grib/windquery.cpp

@@ -190,6 +190,7 @@ WindQuery::WindQuery(QObject *parentObject, bool logVerbose)
   connect(downloader, &GribDownloader::gribDownloadFinished, this, &WindQuery::gribDownloadFinished);
   connect(downloader, &GribDownloader::gribDownloadFailed, this, &WindQuery::gribDownloadFailed);
   connect(downloader, &GribDownloader::gribDownloadSslErrors, this, &WindQuery::windDownloadSslErrors);
+  connect(downloader, &GribDownloader::gribDownloadProgress, this, &WindQuery::windDownloadProgress);
 
   // Set up file watcher for file based updates
   fileWatcher = new atools::util::FileSystemWatcher(parentObject, logVerbose);

src/grib/windquery.h

@@ -229,6 +229,8 @@ class WindQuery
   /* Emitted on SSL errors. Call setIgnoreSslErrors to ignore future errors and continue.  */
   void windDownloadSslErrors(const QStringList& errors, const QString& downloadUrl);
 
+  void windDownloadProgress(qint64 bytesReceived, qint64 bytesTotal, QString downloadUrl);
+
 private:
   /* Wind for grid position */
   WindData windForLayer(const WindAltLayer& layer, const QPoint& point) const;