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

refs #452 signals in reader classes. adjusted METAR reader

Browse Source 
* renamed to connectDataReadSignal
* removed unused individual signals, e.g. vatsimMetarsRead -> replace by data read signal + entity flag
* added data in METAR class (kept there, not in airspace monitor) -> reader aware
This commit is contained in:
Klaus Basan
2015-09-28 18:16:34 +02:00
committed by Mathew Sutcliffe
parent 29d436ee67
commit 8827b68b3b
25 changed files with 241 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackgui/components/dbaircrafticaocomponent.cpp
View File

@@ -39,7 +39,7 @@ namespace BlackGui
{
CWebDataServicesAware::setProvider(webDataReaderProvider);
this->ui->filter_AircraftIcao->setProvider(webDataReaderProvider);
connectSwiftDatabaseSignals(
connectDataReadSignal(
this,
std::bind(&CDbAircraftIcaoComponent::ps_icaoRead, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)
);

2
src/blackgui/components/dbaircrafticaoselectorcomponent.cpp
View File

@@ -40,7 +40,7 @@ namespace BlackGui
{
if (!webDataReaderProvider) { return; }
CWebDataServicesAware::setProvider(webDataReaderProvider);
connectSwiftDatabaseSignals(
connectDataReadSignal(
this,
std::bind(&CDbAircraftIcaoSelectorComponent::ps_codesRead, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)
);

2
src/blackgui/components/dbairlineicaocomponent.cpp
View File

@@ -40,7 +40,7 @@ namespace BlackGui
{
CWebDataServicesAware::setProvider(webDataReaderProvider);
this->ui->filter_AirlineIcao->setProvider(webDataReaderProvider);
webDataReaderProvider->connectSwiftDatabaseSignals(
webDataReaderProvider->connectDataReadSignal(
this,
std::bind(&CDbAirlineIcaoComponent::ps_icaoRead, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)
);

2
src/blackgui/components/dbairlineicaoselectorcomponent.cpp
View File

@@ -42,7 +42,7 @@ namespace BlackGui
{
if (!webDataReaderProvider) { return; }
CWebDataServicesAware::setProvider(webDataReaderProvider);
connectSwiftDatabaseSignals(
connectDataReadSignal(
this,
std::bind(&CDbAirlineIcaoSelectorComponent::ps_codesRead, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)
);

2
src/blackgui/components/dbcountrycomponent.cpp
View File

@@ -40,7 +40,7 @@ namespace BlackGui
void CDbCountryComponent::setProvider(IWebDataServicesProvider *webDataReaderProvider)
{
CWebDataServicesAware::setProvider(webDataReaderProvider);
connectSwiftDatabaseSignals(
connectDataReadSignal(
this,
std::bind(&CDbCountryComponent::ps_countriesRead, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)
);

2
src/blackgui/components/dbcountryselectorcomponent.cpp
View File

@@ -43,7 +43,7 @@ namespace BlackGui
{
if (!webDataReaderProvider) { return; }
CWebDataServicesAware::setProvider(webDataReaderProvider);
webDataReaderProvider->connectSwiftDatabaseSignals(
webDataReaderProvider->connectDataReadSignal(
this,
std::bind(&CDbCountrySelectorComponent::ps_CountriesRead, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)
);

2
src/blackgui/components/dbdistributorcomponent.cpp
View File

@@ -36,7 +36,7 @@ namespace BlackGui
void CDbDistributorComponent::setProvider(IWebDataServicesProvider *webDataReaderProvider)
{
CWebDataServicesAware::setProvider(webDataReaderProvider);
connectSwiftDatabaseSignals(
connectDataReadSignal(
this,
std::bind(&CDbDistributorComponent::ps_distributorsRead, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)
);

2
src/blackgui/components/dbdistributorselectorcomponent.cpp
View File

@@ -41,7 +41,7 @@ namespace BlackGui
void CDbDistributorSelectorComponent::setProvider(Network::IWebDataServicesProvider *webDataReaderProvider)
{
CWebDataServicesAware::setProvider(webDataReaderProvider);
connectSwiftDatabaseSignals(
connectDataReadSignal(
this,
std::bind(&CDbDistributorSelectorComponent::ps_distributorsRead, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)
);

2
src/blackgui/components/dbliverycomponent.cpp
View File

@@ -39,7 +39,7 @@ namespace BlackGui
void CDbLiveryComponent::setProvider(IWebDataServicesProvider *webDataReaderProvider)
{
CWebDataServicesAware::setProvider(webDataReaderProvider);
connectSwiftDatabaseSignals(
connectDataReadSignal(
this,
std::bind(&CDbLiveryComponent::ps_liveriesRead, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)
);

2
src/blackgui/components/dbmodelcomponent.cpp
View File

@@ -44,7 +44,7 @@ namespace BlackGui
void CDbModelComponent::setProvider(IWebDataServicesProvider *webDataReaderProvider)
{
CWebDataServicesAware::setProvider(webDataReaderProvider);
webDataReaderProvider->connectSwiftDatabaseSignals(
webDataReaderProvider->connectDataReadSignal(
this,
std::bind(&CDbModelComponent::ps_modelsRead, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)
);

2
src/blackgui/components/infobarwebreadersstatuscomponent.cpp
View File

@@ -54,7 +54,7 @@ namespace BlackGui
void CInfoBarWebReadersStatusComponent::setProvider(IWebDataServicesProvider *webDataReaderProvider)
{
CWebDataServicesAware::setProvider(webDataReaderProvider);
connectSwiftDatabaseSignals(
connectDataReadSignal(
this,
std::bind(&CInfoBarWebReadersStatusComponent::ps_dataRead, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)
);

14
src/blackgui/components/logincomponent.cpp
View File

@@ -135,13 +135,13 @@ namespace BlackGui
{
Q_ASSERT(getIContextNetwork());
Q_ASSERT(getIContextSettings());
connect(getIContextNetwork(), &IContextNetwork::vatsimDataFileRead, this, &CLoginComponent::ps_onVatsimDataFileLoaded);
connect(getIContextNetwork(), &IContextNetwork::webServiceDataRead, this, &CLoginComponent::ps_onWebServiceDataRead);
connect(getIContextSettings(), &IContextSettings::changedSettings, this, &CLoginComponent::ps_onSettingsChanged);
// inital setup, if data already available
ps_validateAircraftValues();
ps_validateVatsimValues();
ps_onVatsimDataFileLoaded();
ps_onWebServiceDataRead(CEntityFlags::VatsimDataFile, CEntityFlags::ReadFinished, -1);
CServerList otherServers = this->m_trafficNetworkServers.get();
// add a testserver when no servers can be loaded
@@ -266,10 +266,14 @@ namespace BlackGui
}
}
void CLoginComponent::ps_onVatsimDataFileLoaded()
void CLoginComponent::ps_onWebServiceDataRead(int entityI, int stateI, int number)
// void CLoginComponent::ps_onWebServiceDataRead(CEntityFlags::Entity entity, CEntityFlags::ReadState, int number)
{
Q_ASSERT(getIContextNetwork());
Q_ASSERT(getIContextSettings());
CEntityFlags::EntityFlag entity = static_cast<CEntityFlags::EntityFlag>(entityI);
CEntityFlags::ReadState state = static_cast<CEntityFlags::ReadState>(stateI);
if (entity != CEntityFlags::VatsimDataFile || state != CEntityFlags::ReadFinished) { return; }
Q_UNUSED(number);
Q_ASSERT_X(getIContextNetwork(), Q_FUNC_INFO, "Missing context");
CServerList vatsimFsdServers = this->getIContextNetwork()->getVatsimFsdServers();
if (vatsimFsdServers.isEmpty()) { return; }
this->ui->cbp_VatsimServer->setServers(vatsimFsdServers);

6
src/blackgui/components/logincomponent.h
View File

@@ -13,9 +13,10 @@
#define BLACKGUI_LOGINCOMPONENT_H
#include "blackgui/blackguiexport.h"
#include "enableforruntime.h"
#include "blackgui/components/enableforruntime.h"
#include "blackcore/settings/network.h"
#include "blackmisc/network/server.h"
#include "blackmisc/network/entityflags.h"
#include <QFrame>
#include <QScopedPointer>
@@ -25,7 +26,6 @@ namespace BlackGui
{
namespace Components
{
//! Login component
class BLACKGUI_EXPORT CLoginComponent :
public QFrame,
@@ -66,7 +66,7 @@ namespace BlackGui
void ps_toggleNetworkConnection();
//! VATSIM data file was loaded
void ps_onVatsimDataFileLoaded();
void ps_onWebServiceDataRead(int entity, int state, int number);
//! Validate aircaft
bool ps_validateAircraftValues();