flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-28 11:45:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Weather] Style

Browse Source
This commit is contained in:
Klaus Basan
2020-04-10 02:01:07 +02:00
committed by Mat Sutcliffe
parent b63e127b13
commit 524fe1a459
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,7 +214,7 @@ namespace BlackWxPlugin
m_gribData = nwReply->readAll(); m_gribData = nwReply->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);
}); });
@@ -404,7 +404,7 @@ namespace BlackWxPlugin
double topLevelFt = calculateAltitudeFt(gfsGridPoint.pressureAtMsl, gfsCloudLayer.topLevelPressure, gfsCloudLayer.topLevelTemperature); double topLevelFt = calculateAltitudeFt(gfsGridPoint.pressureAtMsl, gfsCloudLayer.topLevelPressure, gfsCloudLayer.topLevelTemperature);
cloudLayer.setBase(CAltitude(bottomLevelFt, CAltitude::MeanSeaLevel, CLengthUnit::ft())); cloudLayer.setBase(CAltitude(bottomLevelFt, CAltitude::MeanSeaLevel, CLengthUnit::ft()));
cloudLayer.setTop(CAltitude(topLevelFt, CAltitude::MeanSeaLevel, CLengthUnit::ft())); cloudLayer.setTop(CAltitude(topLevelFt, CAltitude::MeanSeaLevel, CLengthUnit::ft()));
cloudLayer.setCoveragePercent(gfsCloudLayer.totalCoverage); cloudLayer.setCoveragePercent(qRound(gfsCloudLayer.totalCoverage));
if (gfsGridPoint.surfaceSnow > 0.0) { cloudLayer.setPrecipitation(CCloudLayer::Snow); } if (gfsGridPoint.surfaceSnow > 0.0) { cloudLayer.setPrecipitation(CCloudLayer::Snow); }
if (gfsGridPoint.surfaceRain > 0.0) { cloudLayer.setPrecipitation(CCloudLayer::Rain); } if (gfsGridPoint.surfaceRain > 0.0) { cloudLayer.setPrecipitation(CCloudLayer::Rain); }
@@ -420,7 +420,7 @@ namespace BlackWxPlugin
CLatitude latitude(gfsGridPoint.latitude, CAngleUnit::deg()); CLatitude latitude(gfsGridPoint.latitude, CAngleUnit::deg());
CLongitude longitude(gfsGridPoint.longitude, CAngleUnit::deg()); CLongitude longitude(gfsGridPoint.longitude, CAngleUnit::deg());
auto position = CCoordinateGeodetic { latitude, longitude }; auto position = CCoordinateGeodetic { latitude, longitude };
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);
} }
} }
@@ -570,7 +570,7 @@ namespace BlackWxPlugin
if (gridPoint.longitude >= 360.0f) { gridPoint.longitude -= 360.0f; } if (gridPoint.longitude >= 360.0f) { gridPoint.longitude -= 360.0f; }
if (gridPoint.longitude < 0.0f) { gridPoint.longitude += 360.0f; } if (gridPoint.longitude < 0.0f) { gridPoint.longitude += 360.0f; }
gridPoint.fieldPosition = ix + i; gridPoint.fieldPosition = ix + i;
CCoordinateGeodetic gridPointPosition(gridPoint.latitude, gridPoint.longitude, 0); const CCoordinateGeodetic gridPointPosition(gridPoint.latitude, gridPoint.longitude, 0);
if (m_maxRange == CLength()) if (m_maxRange == CLength())
{ {
m_gfsWeatherGrid.append(gridPoint); m_gfsWeatherGrid.append(gridPoint);
@@ -579,8 +579,8 @@ namespace BlackWxPlugin
{ {
for (const CGridPoint &fixedGridPoint : as_const(m_grid)) for (const CGridPoint &fixedGridPoint : as_const(m_grid))
{ {
auto distance = calculateGreatCircleDistance(gridPointPosition, fixedGridPoint.getPosition()).value(CLengthUnit::m()); const auto distance = calculateGreatCircleDistance(gridPointPosition, fixedGridPoint.getPosition()).value(CLengthUnit::m());
auto maxRange = m_maxRange.value(CLengthUnit::m()); const auto maxRange = m_maxRange.value(CLengthUnit::m());
if (distance < maxRange) if (distance < maxRange)
{ {
m_gfsWeatherGrid.append(gridPoint); m_gfsWeatherGrid.append(gridPoint);
@@ -588,9 +588,9 @@ namespace BlackWxPlugin
} }
} }
} }
} } // for
} } // for
} } // if
} }
void CWeatherDataGfs::handleProductDefinitionTemplate40(const gribfield *gfld) void CWeatherDataGfs::handleProductDefinitionTemplate40(const gribfield *gfld)