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

Style

Browse Source
This commit is contained in:
Roland Rossgotterer
2019-02-11 14:50:08 +01:00
committed by Mat Sutcliffe
parent 9d1299741e
commit a5e841f31d
1 changed files with 21 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -334,7 +334,7 @@ namespace BlackWxPlugin
CLatitude latitude(gfsGridPoint.latitude, CAngleUnit::deg());
CLongitude longitude(gfsGridPoint.longitude, CAngleUnit::deg());
auto position = CCoordinateGeodetic { latitude, longitude, {0} };
auto position = CCoordinateGeodetic { latitude, longitude };
CGridPoint gridPoint({}, position, cloudLayers, temperatureLayers, {}, windLayers, pressureAtMsl);
m_weatherGrid.push_back(gridPoint);
}
@@ -530,46 +530,26 @@ namespace BlackWxPlugin
return;
}
double level = 0;
switch (typeFirstFixedSurface)
double level = 0.0;
switch(typeFirstFixedSurface)
{
case GroundOrWaterSurface:
level = 0;
break;
case IsobaricSurface:
level = std::round(millibarToLevel(valueFirstFixedSurface));
break;
case MeanSeaLevel:
level = 0.0;
break;
default:
CLogMessage(this).warning(u"Unexpected first fixed surface type: %1") << typeFirstFixedSurface;
return;
case GroundOrWaterSurface: level = 0.0; break;
case IsobaricSurface: level = std::round(millibarToLevel(valueFirstFixedSurface)); break;
case MeanSeaLevel: level = 0.0; break;
default: CLogMessage(this).warning(u"Unexpected first fixed surface type: %1") << typeFirstFixedSurface; return;
}
auto parameterValue = m_grib2ParameterTable[key];
switch (parameterValue.code)
{
case TMP:
setTemperature(gfld->fld, level);
break;
case RH:
setHumidity(gfld->fld, level);
break;
case UGRD:
setWindU(gfld->fld, level);
break;
case VGRD:
setWindV(gfld->fld, level);
break;
case PRMSL:
setPressureAtMsl(gfld->fld);
break;
case PRES:
break;
default:
Q_ASSERT(false);
break;
case TMP: setTemperature(gfld->fld, level); break;
case RH: setHumidity(gfld->fld, level); break;
case UGRD: setWindU(gfld->fld, level); break;
case VGRD: setWindV(gfld->fld, level); break;
case PRMSL: setPressureAtMsl(gfld->fld); break;
case PRES: /* Do nothing */ break;
default: CLogMessage(this).error(u"Unexpected parameterValue in Template 4.0: %1 (%2)") << parameterValue.code << parameterValue.name; return;
}
}
@@ -609,23 +589,12 @@ namespace BlackWxPlugin
auto parameterValue = m_grib2ParameterTable[key];
switch (parameterValue.code)
{
case TCDC:
setCloudCoverage(gfld->fld, grib2CloudLevelHash.value(typeFirstFixedSurface));
break;
case PRES:
setCloudLevel(gfld->fld, typeFirstFixedSurface, grib2CloudLevelHash.value(typeFirstFixedSurface));
break;
case PRATE:
setPrecipitationRate(gfld->fld);
break;
case CRAIN:
setSurfaceRain(gfld->fld);
break;
case CSNOW:
setSurfaceSnow(gfld->fld);
break;
default:
break;
case TCDC: setCloudCoverage(gfld->fld, grib2CloudLevelHash.value(typeFirstFixedSurface)); break;
case PRES: setCloudLevel(gfld->fld, typeFirstFixedSurface, grib2CloudLevelHash.value(typeFirstFixedSurface)); break;
case PRATE: setPrecipitationRate(gfld->fld); break;
case CRAIN: setSurfaceRain(gfld->fld); break;
case CSNOW: setSurfaceSnow(gfld->fld); break;
default: CLogMessage(this).error(u"Unexpected parameterValue in Template 4.8: %1 (%2)") << parameterValue.code << parameterValue.name; return;
}
}