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

Fix sampleweatherdata to accept negative Lat/Lon values

Browse Source
This commit is contained in:
Roland Rossgotterer
2019-02-11 14:25:59 +01:00
committed by Mat Sutcliffe
parent a56ae0302a
commit d50811c941
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
samples/weatherdata/reader.cpp
View File

@@ -33,7 +33,7 @@ void CLineReader::run()
{ {
QFile file; QFile file;
file.open(stdin, QIODevice::ReadOnly | QIODevice::Text); file.open(stdin, QIODevice::ReadOnly | QIODevice::Text);
QRegularExpression re("^(\\d+).([0,5])\\s(\\d+).([0,5])$"); QRegularExpression re("^(-?\\d+).([0,5])\\s(-?\\d+).([0,5])$");
forever forever
{ {
QString line = file.readLine().trimmed(); QString line = file.readLine().trimmed();
@@ -48,8 +48,11 @@ void CLineReader::run()
if (match.hasMatch()) if (match.hasMatch())
{ {
double latitudeValue = match.captured(1).toDouble(); double latitudeValue = match.captured(1).toDouble();
latitudeValue += match.captured(2).toDouble() / 10; if (latitudeValue > 0) { latitudeValue += match.captured(2).toDouble() / 10; }
else { { latitudeValue -= match.captured(2).toDouble() / 10; } }
double longitudeValue = match.captured(3).toDouble(); double longitudeValue = match.captured(3).toDouble();
if (longitudeValue > 0) { longitudeValue += match.captured(4).toDouble() / 10; }
else { longitudeValue -= match.captured(4).toDouble() / 10; }
longitudeValue += match.captured(4).toDouble() / 10; longitudeValue += match.captured(4).toDouble() / 10;
const CLatitude latitude(latitudeValue, CAngleUnit::deg()); const CLatitude latitude(latitudeValue, CAngleUnit::deg());
const CLongitude longitude(longitudeValue, CAngleUnit::deg()); const CLongitude longitude(longitudeValue, CAngleUnit::deg());