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

Ref T472, support for category in ICAO reader

Browse Source
This commit is contained in:
Klaus Basan
2019-02-01 00:03:06 +01:00
committed by Mat Sutcliffe
parent 29b9bf2f34
commit f78d13047e
3 changed files with 182 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/blackcore/db/icaodatareader.h
View File

@@ -128,6 +128,14 @@ namespace BlackCore
//! \threadsafe
BlackMisc::Aviation::CAirlineIcaoCode smartAirlineIcaoSelector(const BlackMisc::Aviation::CAirlineIcaoCode &icaoPattern, const BlackMisc::Aviation::CCallsign &callsign = BlackMisc::Aviation::CCallsign()) const;
//! Get aircraft categories
//! \threadsafe
BlackMisc::Aviation::CAircraftCategoryList getAircraftCategories() const;
//! Get aircraft category count
//! \threadsafe
int getAircraftCategoryCount() const;
//! All data read?
//! \threadsafe
bool areAllDataRead() const;
@@ -155,12 +163,14 @@ namespace BlackCore
virtual BlackMisc::Network::CUrl getDbServiceBaseUrl() const override;
private:
BlackMisc::CData<BlackCore::Data::TDbAircraftIcaoCache> m_aircraftIcaoCache {this, &CIcaoDataReader::aircraftIcaoCacheChanged };
BlackMisc::CData<BlackCore::Data::TDbAirlineIcaoCache> m_airlineIcaoCache {this, &CIcaoDataReader::airlineIcaoCacheChanged };
BlackMisc::CData<BlackCore::Data::TDbCountryCache> m_countryCache {this, &CIcaoDataReader::countryCacheChanged };
BlackMisc::CData<BlackCore::Data::TDbAircraftIcaoCache> m_aircraftIcaoCache {this, &CIcaoDataReader::aircraftIcaoCacheChanged };
BlackMisc::CData<BlackCore::Data::TDbAirlineIcaoCache> m_airlineIcaoCache {this, &CIcaoDataReader::airlineIcaoCacheChanged };
BlackMisc::CData<BlackCore::Data::TDbCountryCache> m_countryCache {this, &CIcaoDataReader::countryCacheChanged };
BlackMisc::CData<BlackCore::Data::TDbAircraftCategoryCache> m_categoryCache {this, &CIcaoDataReader::aircraftCategoryCacheChanged };
std::atomic_bool m_syncedAircraftIcaoCache { false }; //!< already synchronized?
std::atomic_bool m_syncedAirlineIcaoCache { false }; //!< already synchronized?
std::atomic_bool m_syncedCountryCache { false }; //!< already synchronized?
std::atomic_bool m_syncedCategories { false }; //!< already synchronized?
//! \copydoc CDatabaseReader::read
virtual void read(BlackMisc::Network::CEntityFlags::Entity entities,
@@ -178,6 +188,9 @@ namespace BlackCore
//! Countries have been read
void parseCountryData(QNetworkReply *nwReply);
//! Categories have been read
void parseAircraftCategoryData(QNetworkReply *nwReplyPtr);
//! Cache has changed elsewhere
void aircraftIcaoCacheChanged();
@@ -187,6 +200,9 @@ namespace BlackCore
//! Cache has changed elsewhere
void countryCacheChanged();
//! Cache has changed elsewhere
void aircraftCategoryCacheChanged();
//! Cache has changed elsewhere
void baseUrlCacheChanged();
@@ -201,6 +217,9 @@ namespace BlackCore
//! URL
BlackMisc::Network::CUrl getCountryUrl(BlackMisc::Db::CDbFlags::DataRetrievalModeFlag mode) const;
//! URL
BlackMisc::Network::CUrl getAircraftCategoryUrl(BlackMisc::Db::CDbFlags::DataRetrievalModeFlag mode) const;
};
} // ns
} // ns