Use CApplications QNetworkAccessManager to download GFS data

This commit is contained in:
Roland Winklmeier
2017-01-03 01:58:35 +01:00
committed by Mathew Sutcliffe
parent 115ad150b2
commit 2cea07f174
2 changed files with 5 additions and 8 deletions

View File

@@ -8,6 +8,7 @@
*/
#include "weatherdatagfs.h"
#include "blackcore/application.h"
#include "blackmisc/worker.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/math/mathutils.h"
@@ -51,11 +52,8 @@ namespace BlackWxPlugin
}
CWeatherDataGfs::CWeatherDataGfs(QObject *parent) :
IWeatherData(parent),
m_networkAccessManager(this)
{
connect(&m_networkAccessManager, &QNetworkAccessManager::finished, this, &CWeatherDataGfs::ps_parseGfsFile);
}
IWeatherData(parent)
{ }
void CWeatherDataGfs::fetchWeatherData(const CWeatherGrid &grid, const CLength &range)
{
@@ -67,7 +65,7 @@ namespace BlackWxPlugin
QUrl url = getDownloadUrl();
CLogMessage(this).debug() << "Download url:" << url.toString();
QNetworkRequest request(url);
m_networkAccessManager.get(request);
sApp->getFromNetwork(request, { this, &CWeatherDataGfs::ps_parseGfsFile });
}
else
{

View File

@@ -19,8 +19,8 @@
#include <QHash>
#include <QVector>
#include <QUrl>
#include <QNetworkAccessManager>
#include <QByteArray>
#include <QNetworkReply>
#include <array>
class QNetworkAccessManager;
@@ -157,7 +157,6 @@ namespace BlackWxPlugin
mutable QReadWriteLock m_lockData;
QByteArray m_gribData;
QNetworkAccessManager m_networkAccessManager;
QVector<GfsGridPoint> m_gfsWeatherGrid;
BlackMisc::Weather::CWeatherGrid m_weatherGrid;