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

Ref T189, database reader renamings / status renamings

Browse Source 
* plural "entities" where multiple values can occur
* LED member renamings
This commit is contained in:
Klaus Basan
2017-11-22 04:30:16 +01:00
parent c22a4a8430
commit da6930a7b4
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/blackcore/db/databasereader.h
View File

@@ -269,6 +269,7 @@ namespace BlackCore
void swiftDbDataRead(bool success); void swiftDbDataRead(bool success);
//! Combined read signal //! Combined read signal
//! \remark normally in success case state for a single case, skipped cases can be reported for 1..n enities
void dataRead(BlackMisc::Network::CEntityFlags::Entity entities, BlackMisc::Network::CEntityFlags::ReadState state, int number); void dataRead(BlackMisc::Network::CEntityFlags::Entity entities, BlackMisc::Network::CEntityFlags::ReadState state, int number);
//! Header of shared file read //! Header of shared file read

2
src/blackcore/db/icaodatareader.cpp
View File

@@ -154,7 +154,7 @@ namespace BlackCore
return this->getCountries().size(); return this->getCountries().size();
} }
void CIcaoDataReader::ps_read(BlackMisc::Network::CEntityFlags::Entity entities, BlackMisc::Db::CDbFlags::DataRetrievalModeFlag mode, const QDateTime &newerThan) void CIcaoDataReader::ps_read(CEntityFlags::Entity entities, CDbFlags::DataRetrievalModeFlag mode, const QDateTime &newerThan)
{ {
this->threadAssertCheck(); // runs in background thread this->threadAssertCheck(); // runs in background thread
if (!this->doWorkCheck()) { return; } if (!this->doWorkCheck()) { return; }

26
src/blackgui/components/infobarwebreadersstatuscomponent.h
View File

@@ -59,18 +59,18 @@ namespace BlackGui
void setLedReadState(CLedWidget *led, BlackMisc::Network::CEntityFlags::ReadState readState); void setLedReadState(CLedWidget *led, BlackMisc::Network::CEntityFlags::ReadState readState);
//! Maps entity to its id //! Maps entity to its id
QList<CLedWidget *> entityToLeds(BlackMisc::Network::CEntityFlags::Entity entity) const; QList<CLedWidget *> entitiesToLeds(BlackMisc::Network::CEntityFlags::Entity entities) const;
//! All data read //! All data read
bool hasAllData() const; bool hasAllData() const;
//! Initial setup of leds //! Initial setup of leds
void setLeds(BlackGui::CLedWidget *ledDb, BlackGui::CLedWidget *ledDataReady, CLedWidget *ledConsolidation, void setLeds(BlackGui::CLedWidget *ledDb, BlackGui::CLedWidget *ledDataReady, CLedWidget *ledConsolidation,
BlackGui::CLedWidget *led_IcaoAircraft, BlackGui::CLedWidget *led_IcaoAirline, BlackGui::CLedWidget *led_Countries, BlackGui::CLedWidget *ledIcaoAircraft, BlackGui::CLedWidget *ledIcaoAirline, BlackGui::CLedWidget *ledCountries,
BlackGui::CLedWidget *led_Distributors, BlackGui::CLedWidget *led_Liveries, BlackGui::CLedWidget *led_Models); BlackGui::CLedWidget *ledDistributors, BlackGui::CLedWidget *ledLiveries, BlackGui::CLedWidget *ledModels);
//! Data have been read //! Data have been read
void dataRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState readState, int count); void dataRead(BlackMisc::Network::CEntityFlags::Entity entities, BlackMisc::Network::CEntityFlags::ReadState readState, int count);
//! DB or network accessibility changed //! DB or network accessibility changed
void accessibilityChanged(bool accessible); void accessibilityChanged(bool accessible);
@@ -83,15 +83,15 @@ namespace BlackGui
private: private:
QTimer m_timer { this }; //!< check timer QTimer m_timer { this }; //!< check timer
BlackGui::CLedWidget *led_SwiftDb = nullptr; BlackGui::CLedWidget *m_ledSwiftDb = nullptr;
BlackGui::CLedWidget *led_DataReady = nullptr; BlackGui::CLedWidget *m_ledDataReady = nullptr;
BlackGui::CLedWidget *led_Consolidation = nullptr; BlackGui::CLedWidget *m_ledConsolidation = nullptr;
BlackGui::CLedWidget *led_IcaoAircraft = nullptr; BlackGui::CLedWidget *m_ledIcaoAircraft = nullptr;
BlackGui::CLedWidget *led_IcaoAirline = nullptr; BlackGui::CLedWidget *m_ledIcaoAirline = nullptr;
BlackGui::CLedWidget *led_Countries = nullptr; BlackGui::CLedWidget *m_ledCountries = nullptr;
BlackGui::CLedWidget *led_Distributors = nullptr; BlackGui::CLedWidget *m_ledDistributors = nullptr;
BlackGui::CLedWidget *led_Liveries = nullptr; BlackGui::CLedWidget *m_ledLiveries = nullptr;
BlackGui::CLedWidget *led_Models = nullptr; BlackGui::CLedWidget *m_ledModels = nullptr;
}; };
//! Info bar displaying status of web readers(swift DB, ...) //! Info bar displaying status of web readers(swift DB, ...)