flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-17 19:05:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T786, weather data parser smaller improvements

Browse Source
This commit is contained in:
Klaus Basan
2020-04-19 04:13:41 +02:00
committed by Mat Sutcliffe
parent 8fe11c7633
commit 50f8b09b62
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/weatherdata/gfs/weatherdatagfs.cpp
View File

@@ -187,7 +187,7 @@ namespace BlackWxPlugin
m_gribData = file.readAll(); m_gribData = file.readAll();
Q_ASSERT_X(!m_parseGribFileWorker, Q_FUNC_INFO, "Worker already running"); Q_ASSERT_X(!m_parseGribFileWorker, Q_FUNC_INFO, "Worker already running");
m_parseGribFileWorker = BlackMisc::CWorker::fromTask(this, "parseGribFile", [this]() m_parseGribFileWorker = CWorker::fromTask(this, "parseGribFile", [this]()
{ {
parseGfsFileImpl(m_gribData); parseGfsFileImpl(m_gribData);
}); });
@@ -320,8 +320,15 @@ namespace BlackWxPlugin
return downloadUrl; return downloadUrl;
} }
void CWeatherDataGfs::parseGfsFileImpl(const QByteArray &gribData) bool CWeatherDataGfs::parseGfsFileImpl(const QByteArray &gribData)
{ {
if (!m_lockData.tryLockForWrite(1000))
{
CLogMessage(this).warning(u"Cannot log CWeatherDataGfs data");
return false;
}
m_lockData.unlock();
QWriteLocker lock(&m_lockData); QWriteLocker lock(&m_lockData);
m_gfsWeatherGrid.clear(); m_gfsWeatherGrid.clear();
@@ -331,7 +338,7 @@ namespace BlackWxPlugin
g2int iseek = 0; g2int iseek = 0;
for (;;) for (;;)
{ {
if (QThread::currentThread()->isInterruptionRequested()) { return; } if (QThread::currentThread()->isInterruptionRequested()) { return false; }
// Search next grib field // Search next grib field
g2int lskip = 0; g2int lskip = 0;
@@ -376,15 +383,16 @@ namespace BlackWxPlugin
} }
messageNo++; messageNo++;
} }
CLogMessage(this).debug() << "Parsed" << messageNo << "GRIB messages."; CLogMessage(this).debug() << "Parsed" << messageNo << "GRIB messages.";
CLogMessage(this).debug() << "Obtained" << m_gfsWeatherGrid.size() << "grid points.";
for (const GfsGridPoint &gfsGridPoint : as_const(m_gfsWeatherGrid)) for (const GfsGridPoint &gfsGridPoint : as_const(m_gfsWeatherGrid))
{ {
if (QThread::currentThread()->isInterruptionRequested()) { return; } if (QThread::currentThread()->isInterruptionRequested()) { return false; }
CTemperatureLayerList temperatureLayers; CTemperatureLayerList temperatureLayers;
CWindLayerList windLayers; CWindLayerList windLayers;
for (const GfsIsobaricLayer &isobaricLayer : gfsGridPoint.isobaricLayers) for (const GfsIsobaricLayer &isobaricLayer : gfsGridPoint.isobaricLayers)
{ {
float level = gfsGridPoint.isobaricLayers.key(isobaricLayer); float level = gfsGridPoint.isobaricLayers.key(isobaricLayer);
@@ -408,7 +416,7 @@ namespace BlackWxPlugin
} }
CCloudLayerList cloudLayers; CCloudLayerList cloudLayers;
for (const GfsCloudLayer &gfsCloudLayer : gfsGridPoint.cloudLayers) for (const GfsCloudLayer &gfsCloudLayer : as_const(gfsGridPoint.cloudLayers))
{ {
if (std::isnan(gfsCloudLayer.bottomLevelPressure) || std::isnan(gfsCloudLayer.topLevelPressure) || std::isnan(gfsCloudLayer.topLevelTemperature)) { continue; } if (std::isnan(gfsCloudLayer.bottomLevelPressure) || std::isnan(gfsCloudLayer.topLevelPressure) || std::isnan(gfsCloudLayer.topLevelTemperature)) { continue; }
@@ -436,6 +444,8 @@ namespace BlackWxPlugin
const CGridPoint gridPoint({}, position, cloudLayers, temperatureLayers, {}, windLayers, pressureAtMsl); const CGridPoint gridPoint({}, position, cloudLayers, temperatureLayers, {}, windLayers, pressureAtMsl);
m_weatherGrid.push_back(gridPoint); m_weatherGrid.push_back(gridPoint);
} }
return true;
} }
void CWeatherDataGfs::findNextGribMessage(unsigned char *buffer, g2int size, g2int iseek, g2int *lskip, g2int *lgrib) void CWeatherDataGfs::findNextGribMessage(unsigned char *buffer, g2int size, g2int iseek, g2int *lskip, g2int *lgrib)

2
src/plugins/weatherdata/gfs/weatherdatagfs.h
View File

@@ -68,7 +68,7 @@ namespace BlackWxPlugin
void parseGfsFile(QNetworkReply *nwReplyPtr); void parseGfsFile(QNetworkReply *nwReplyPtr);
BlackMisc::Network::CUrl getDownloadUrl() const; BlackMisc::Network::CUrl getDownloadUrl() const;
void parseGfsFileImpl(const QByteArray &gribData); bool parseGfsFileImpl(const QByteArray &gribData);
void findNextGribMessage(unsigned char *buffer, g2int size, g2int iseek, g2int *lskip, g2int *lgrib); void findNextGribMessage(unsigned char *buffer, g2int size, g2int iseek, g2int *lskip, g2int *lgrib);
void createWeatherGrid(const gribfield *gfld); void createWeatherGrid(const gribfield *gfld);
void handleProductDefinitionTemplate40(const gribfield *gfld); void handleProductDefinitionTemplate40(const gribfield *gfld);