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

Fix initial reading of Vatsim metars

Browse Source
This commit is contained in:
Roland Winklmeier
2015-10-04 17:54:33 +02:00
committed by Mathew Sutcliffe
parent 69031ef9da
commit c8a914eb7a
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/vatsimmetarreader.cpp
View File

@@ -33,7 +33,7 @@ namespace BlackCore
void CVatsimMetarReader::readInBackgroundThread() void CVatsimMetarReader::readInBackgroundThread()
{ {
bool s = QMetaObject::invokeMethod(this, "ps_readMetar"); bool s = QMetaObject::invokeMethod(this, "ps_readMetars");
Q_ASSERT_X(s, Q_FUNC_INFO, "Cannot invoke"); Q_ASSERT_X(s, Q_FUNC_INFO, "Cannot invoke");
Q_UNUSED(s); Q_UNUSED(s);
} }

14
src/blackcore/webdataservices.cpp
View File

@@ -166,6 +166,15 @@ namespace BlackCore
} }
} }
if (m_vatsimMetarReader)
{
if (whatToRead.testFlag(CEntityFlags::MetarEntity))
{
m_vatsimMetarReader->readInBackgroundThread();
triggeredRead |= CEntityFlags::MetarEntity;
}
}
if (m_icaoDataReader) if (m_icaoDataReader)
{ {
if (whatToRead.testFlag(CEntityFlags::AircraftIcaoEntity) || whatToRead.testFlag(CEntityFlags::AirlineIcaoEntity) || whatToRead.testFlag(CEntityFlags::CountryEntity)) if (whatToRead.testFlag(CEntityFlags::AircraftIcaoEntity) || whatToRead.testFlag(CEntityFlags::AirlineIcaoEntity) || whatToRead.testFlag(CEntityFlags::CountryEntity))
@@ -471,8 +480,9 @@ namespace BlackCore
else else
{ {
// only readers requested will be read // only readers requested will be read
if (this->m_vatsimBookingReader) {this->m_vatsimBookingReader->readInBackgroundThread(); } if (this->m_vatsimBookingReader) { this->m_vatsimBookingReader->readInBackgroundThread(); }
if (this->m_vatsimDataFileReader) this->m_vatsimDataFileReader->readInBackgroundThread(); if (this->m_vatsimDataFileReader) { this->m_vatsimDataFileReader->readInBackgroundThread(); }
if (this->m_vatsimMetarReader) { this->m_vatsimMetarReader->readInBackgroundThread(); }
if (this->m_icaoDataReader) { this->m_icaoDataReader->readInBackgroundThread(CEntityFlags::AllIcaoAndCountries); } if (this->m_icaoDataReader) { this->m_icaoDataReader->readInBackgroundThread(CEntityFlags::AllIcaoAndCountries); }
if (this->m_modelDataReader) { this->m_modelDataReader->readInBackgroundThread(CEntityFlags::DistributorLiveryModel); } if (this->m_modelDataReader) { this->m_modelDataReader->readInBackgroundThread(CEntityFlags::DistributorLiveryModel); }
} }