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

Added "url" to signature "dataRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState state, int number, const QUrl &url)"

Browse Source 
Allows to write log. messages with URL
This commit is contained in:
Klaus Basan
2020-03-14 01:49:32 +01:00
committed by Mat Sutcliffe
parent f840244bdb
commit 5b3c011a15
37 changed files with 195 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,7 +44,7 @@ namespace BlackGui
connect(ui->tvp_AirlineIcao, &CAirlineIcaoCodeView::requestNewBackendData, this, &CDbAirlineIcaoComponent::onReload);
connect(sGui->getWebDataServices(), &CWebDataServices::dataRead, this, &CDbAirlineIcaoComponent::onIcaoRead, Qt::QueuedConnection);
connect(sGui->getWebDataServices(), &CWebDataServices::entityDownloadProgress, this, &CDbAirlineIcaoComponent::onEntityDownloadProgress, Qt::QueuedConnection);
this->onIcaoRead(CEntityFlags::AirlineIcaoEntity, CEntityFlags::ReadFinished, sGui->getWebDataServices()->getAirlineIcaoCodesCount());
this->onIcaoRead(CEntityFlags::AirlineIcaoEntity, CEntityFlags::ReadFinished, sGui->getWebDataServices()->getAirlineIcaoCodesCount(), {});
}
CDbAirlineIcaoComponent::~CDbAirlineIcaoComponent()
@@ -55,9 +55,11 @@ namespace BlackGui
return ui->tvp_AirlineIcao;
}
void CDbAirlineIcaoComponent::onIcaoRead(CEntityFlags::Entity entity, CEntityFlags::ReadState readState, int count)
void CDbAirlineIcaoComponent::onIcaoRead(CEntityFlags::Entity entity, CEntityFlags::ReadState readState, int count, const QUrl &url)
{
Q_UNUSED(count);
Q_UNUSED(count)
Q_UNUSED(url)
if (!sGui || sGui->isShuttingDown() || !sGui->hasWebDataServices()) { return; }
if (!entity.testFlag(CEntityFlags::AirlineIcaoEntity)) { return; }

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

@@ -49,7 +49,7 @@ namespace BlackGui
private:
//! ICAO codes have been read
void onIcaoRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState readState, int count);
void onIcaoRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState readState, int count, const QUrl &url);
//! Download progress for an entity
void onEntityDownloadProgress(BlackMisc::Network::CEntityFlags::Entity entity, int logId, int progress, qint64 current, qint64 max, const QUrl &url);

6
src/blackgui/components/dbairlineicaoselectorbase.cpp
View File

@@ -53,7 +53,7 @@ namespace BlackGui
{
if (!sGui || sGui->isShuttingDown()) { return; }
if (!myself) { return; }
this->onCodesRead(CEntityFlags::AirlineIcaoEntity, CEntityFlags::ReadFinished, c);
this->onCodesRead(CEntityFlags::AirlineIcaoEntity, CEntityFlags::ReadFinished, c, {});
});
}
}
@@ -130,8 +130,10 @@ namespace BlackGui
}
}
void CDbAirlineIcaoSelectorBase::onCodesRead(CEntityFlags::Entity entity, CEntityFlags::ReadState readState, int count)
void CDbAirlineIcaoSelectorBase::onCodesRead(CEntityFlags::Entity entity, CEntityFlags::ReadState readState, int count, const QUrl &url)
{
Q_UNUSED(url)
if (!sGui) { return; }
if (entity.testFlag(CEntityFlags::AirlineIcaoEntity) && CEntityFlags::isFinishedReadState(readState))
{

2
src/blackgui/components/dbairlineicaoselectorbase.h
View File

@@ -91,7 +91,7 @@ namespace BlackGui
private:
//! Airlines have been read
void onCodesRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState readState, int count);
void onCodesRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState readState, int count, const QUrl &url);
//! Data have been changed
void onCompleterActivated(const QString &icaoString);

7
src/blackgui/components/dbautostashingcomponent.cpp
View File

@@ -121,11 +121,12 @@ namespace BlackGui
this->setVisible(true);
}
void CDbAutoStashingComponent::onEntitiesRead(CEntityFlags::Entity entity, CEntityFlags::ReadState readState, int count)
void CDbAutoStashingComponent::onEntitiesRead(CEntityFlags::Entity entity, CEntityFlags::ReadState readState, int count, const QUrl &url)
{
if (readState != CEntityFlags::ReadFinished) { return; }
Q_UNUSED(count);
Q_UNUSED(entity);
Q_UNUSED(count)
Q_UNUSED(entity)
Q_UNUSED(url)
}
void CDbAutoStashingComponent::resetDescription()

2
src/blackgui/components/dbautostashingcomponent.h
View File

@@ -82,7 +82,7 @@ namespace BlackGui
QScopedPointer<Ui::CDbAutoStashingComponent> ui;
//! Data have been read
void onEntitiesRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState readState, int count);
void onEntitiesRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState readState, int count, const QUrl &url);
//! Reset the description settings
void resetDescription();

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

@@ -39,15 +39,17 @@ namespace BlackGui
ui->tvp_Countries->allowDragDrop(true, false);
connect(sApp->getWebDataServices(), &CWebDataServices::dataRead, this, &CDbCountryComponent::onCountriesRead, Qt::QueuedConnection);
this->onCountriesRead(CEntityFlags::CountryEntity, CEntityFlags::ReadFinished, sGui->getWebDataServices()->getCountriesCount());
this->onCountriesRead(CEntityFlags::CountryEntity, CEntityFlags::ReadFinished, sGui->getWebDataServices()->getCountriesCount(), {});
}
CDbCountryComponent::~CDbCountryComponent()
{ }
void CDbCountryComponent::onCountriesRead(CEntityFlags::Entity entity, CEntityFlags::ReadState readState, int count)
void CDbCountryComponent::onCountriesRead(CEntityFlags::Entity entity, CEntityFlags::ReadState readState, int count, const QUrl &url)
{
Q_UNUSED(count);
Q_UNUSED(count)
Q_UNUSED(url)
if (!sGui || sGui->isShuttingDown() || !sGui->getWebDataServices()) { return; }
if (entity.testFlag(CEntityFlags::CountryEntity) && CEntityFlags::isFinishedReadState(readState))
{

4
src/blackgui/components/dbcountrycomponent.h
View File

@@ -42,11 +42,11 @@ namespace BlackGui
explicit CDbCountryComponent(QWidget *parent = nullptr);
//! Destructor
virtual ~CDbCountryComponent();
virtual ~CDbCountryComponent() override;
private:
//! Countries have been read
void onCountriesRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState readState, int count);
void onCountriesRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState readState, int count, const QUrl &url);
//! Reload models
void onReload();

8
src/blackgui/components/dbliveryselectorcomponent.cpp
View File

@@ -54,7 +54,7 @@ namespace BlackGui
connect(ui->le_Livery, &QLineEdit::returnPressed, this, &CDbLiverySelectorComponent::onDataChanged);
connect(sGui->getWebDataServices(), &CWebDataServices::dataRead, this, &CDbLiverySelectorComponent::onLiveriesRead, Qt::QueuedConnection);
this->onLiveriesRead(CEntityFlags::LiveryEntity, CEntityFlags::ReadFinished, sGui->getWebDataServices()->getLiveriesCount());
this->onLiveriesRead(CEntityFlags::LiveryEntity, CEntityFlags::ReadFinished, sGui->getWebDataServices()->getLiveriesCount(), {});
}
CDbLiverySelectorComponent::~CDbLiverySelectorComponent()
@@ -183,14 +183,16 @@ namespace BlackGui
}
}
void CDbLiverySelectorComponent::onLiveriesRead(CEntityFlags::Entity entity, CEntityFlags::ReadState readState, int count)
void CDbLiverySelectorComponent::onLiveriesRead(CEntityFlags::Entity entity, CEntityFlags::ReadState readState, int count, const QUrl &url)
{
Q_UNUSED(url)
if (!sGui || sGui->isShuttingDown() || !sGui->hasWebDataServices()) { return; }
if (entity.testFlag(CEntityFlags::LiveryEntity) && CEntityFlags::isFinishedReadState(readState))
{
if (count > 0)
{
QStringList codes(sApp->getWebDataServices()->getLiveries().getCombinedCodesPlusInfo(true));
const QStringList codes(sApp->getWebDataServices()->getLiveries().getCombinedCodesPlusInfo(true));
QCompleter *c = new QCompleter(codes, this);
c->setCaseSensitivity(Qt::CaseInsensitive);
c->setCompletionMode(QCompleter::PopupCompletion);

2
src/blackgui/components/dbliveryselectorcomponent.h
View File

@@ -100,7 +100,7 @@ namespace BlackGui
void onCompleterActivated(const QString &liveryCode);
//! Distributors have been read
void onLiveriesRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState readState, int count);
void onLiveriesRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState readState, int count, const QUrl &url);
//! Strip extra info from livery code
QString stripExtraInfo(const QString &liveryCode) const;

16
src/blackgui/components/dbloaddatadialog.cpp
View File

@@ -103,7 +103,7 @@ namespace BlackGui
}
}
void CDbLoadDataDialog::onDataRead(CEntityFlags::Entity entity, CEntityFlags::ReadState state, int number)
void CDbLoadDataDialog::onDataRead(CEntityFlags::Entity entity, CEntityFlags::ReadState state, int number, const QUrl &url)
{
if (m_pendingEntities == CEntityFlags::NoEntity) { return; } // not triggered from here
if (!m_pendingEntities.testFlag(CEntityFlags::entityToEntityFlag(entity))) { return; }
@@ -115,7 +115,7 @@ namespace BlackGui
if (!CEntityFlags::isFinishedReadStateOrFailure(state)) { return; }
if (state == CEntityFlags::ReadFailed)
{
CLogMessage(this).warning(u"Read failed for %1") << e;
CLogMessage(this).warning(u"Read failed for %1 from '%2'") << e << url.toString();
}
m_pendingEntities &= ~entity;
@@ -157,12 +157,12 @@ namespace BlackGui
void CDbLoadDataDialog::onEntityDownloadProgress(CEntityFlags::Entity entity, int logId, int progress, qint64 current, qint64 max, const QUrl &url)
{
Q_UNUSED(entity);
Q_UNUSED(logId);
Q_UNUSED(progress);
Q_UNUSED(current);
Q_UNUSED(max);
Q_UNUSED(url);
Q_UNUSED(entity)
Q_UNUSED(logId)
Q_UNUSED(progress)
Q_UNUSED(current)
Q_UNUSED(max)
Q_UNUSED(url)
}
void CDbLoadDataDialog::onRejected()

2
src/blackgui/components/dbloaddatadialog.h
View File

@@ -53,7 +53,7 @@ namespace BlackGui
void onButtonClicked(QAbstractButton *button);
//! Data are/have been read
void onDataRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState state, int number);
void onDataRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState state, int number, const QUrl &url);
//! Download progress
void onEntityDownloadProgress(BlackMisc::Network::CEntityFlags::Entity entity, int logId, int progress, qint64 current, qint64 max, const QUrl &url);

6
src/blackgui/components/dbloadoverviewcomponent.cpp
View File

@@ -365,9 +365,11 @@ namespace BlackGui
sGui->getWebDataServices()->triggerReadOfSharedInfoObjects();
}
void CDbLoadOverviewComponent::dataLoaded(CEntityFlags::Entity entities, CEntityFlags::ReadState state, int number)
void CDbLoadOverviewComponent::dataLoaded(CEntityFlags::Entity entities, CEntityFlags::ReadState state, int number, const QUrl &url)
{
Q_UNUSED(number);
Q_UNUSED(number)
Q_UNUSED(url)
if (!CEntityFlags::isFinishedReadState(state)) return;
if (!entities.testFlag(CEntityFlags::SharedInfoObjectEntity) && !entities.testFlag(CEntityFlags::DbInfoObjectEntity) && !CEntityFlags::anySwiftDbEntity(entities)) { return; }
m_loadInProgress = false;

2
src/blackgui/components/dbloadoverviewcomponent.h
View File

@@ -97,7 +97,7 @@ namespace BlackGui
void setSharedUrlValues();
//! Data have been loaded
void dataLoaded(BlackMisc::Network::CEntityFlags::Entity entities, BlackMisc::Network::CEntityFlags::ReadState state, int number);
void dataLoaded(BlackMisc::Network::CEntityFlags::Entity entities, BlackMisc::Network::CEntityFlags::ReadState state, int number, const QUrl &url);
//! Load info objects if not already loaded
void loadInfoObjects();

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

@@ -58,7 +58,7 @@ namespace BlackGui
connect(sGui, &CGuiApplication::styleSheetsChanged, this, &CDbModelComponent::onStyleSheetChanged, Qt::QueuedConnection);
connect(sGui->getWebDataServices(), &CWebDataServices::dataRead, this, &CDbModelComponent::onModelsRead);
connect(sGui->getWebDataServices(), &CWebDataServices::entityDownloadProgress, this, &CDbModelComponent::onEntityDownloadProgress, Qt::QueuedConnection);
this->onModelsRead(CEntityFlags::ModelEntity, CEntityFlags::ReadFinished, sApp->getWebDataServices()->getModelsCount());
this->onModelsRead(CEntityFlags::ModelEntity, CEntityFlags::ReadFinished, sApp->getWebDataServices()->getModelsCount(), {});
}
CDbModelComponent::~CDbModelComponent()
@@ -84,9 +84,11 @@ namespace BlackGui
sGui->getWebDataServices()->triggerLoadingDirectlyFromDb(CEntityFlags::ModelEntity, ts);
}
void CDbModelComponent::onModelsRead(CEntityFlags::Entity entity, CEntityFlags::ReadState readState, int count)
void CDbModelComponent::onModelsRead(CEntityFlags::Entity entity, CEntityFlags::ReadState readState, int count, const QUrl &url)
{
Q_UNUSED(count);
Q_UNUSED(count)
Q_UNUSED(url)
if (!sGui || sGui->isShuttingDown() || !sGui->getWebDataServices()) { return; }
if (!entity.testFlag(CEntityFlags::ModelEntity)) { return; }
@@ -116,7 +118,7 @@ namespace BlackGui
{
if (!entity.testFlag(CEntityFlags::ModelEntity)) { return; }
this->showDownloadProgress(progress, current, max, url, 5000);
Q_UNUSED(logId);
Q_UNUSED(logId)
}
} // ns
} // ns

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

@@ -61,7 +61,7 @@ namespace BlackGui
private:
//! Models have been read
void onModelsRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState readState, int count);
void onModelsRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState readState, int count, const QUrl &url);
//! Reload models
void onReload();

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

@@ -48,7 +48,7 @@ namespace BlackGui
Q_ASSERT_X(c, Q_FUNC_INFO, "Failed connect");
}
Q_UNUSED(c);
Q_UNUSED(c)
}
CInfoBarWebReadersStatusBase::~CInfoBarWebReadersStatusBase()

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

@@ -169,7 +169,7 @@ namespace BlackGui
this->validateAircraftValues();
ui->form_Pilot->validate();
ui->cb_AutoLogoff->setChecked(m_networkSetup.useAutoLogoff());
this->onWebServiceDataRead(CEntityFlags::VatsimDataFile, CEntityFlags::ReadFinished, -1);
this->onWebServiceDataRead(CEntityFlags::VatsimDataFile, CEntityFlags::ReadFinished, -1, {});
this->reloadOtherServersSetup();
connect(ui->pb_OverrideCredentialsVatsim, &QPushButton::clicked, this, &CLoginComponent::overrideCredentialsToPilot);
@@ -362,11 +362,13 @@ namespace BlackGui
}
}
void CLoginComponent::onWebServiceDataRead(CEntityFlags::Entity entity, CEntityFlags::ReadState state, int number)
void CLoginComponent::onWebServiceDataRead(CEntityFlags::Entity entity, CEntityFlags::ReadState state, int number, const QUrl &url)
{
if (!CEntityFlags::isFinishedReadState(state)) { return; }
if (!sGui || !sGui->getIContextNetwork() || sGui->isShuttingDown()) { return; }
Q_UNUSED(number)
Q_UNUSED(url)
if (entity == CEntityFlags::VatsimDataFile)
{
@@ -682,7 +684,7 @@ namespace BlackGui
void CLoginComponent::onChangedAirlineIcao(const CAirlineIcaoCode &icao)
{
Q_UNUSED(icao);
Q_UNUSED(icao)
this->validateAircraftValues();
}

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

@@ -162,7 +162,7 @@ namespace BlackGui
void loginCancelled();
//! VATSIM data file was loaded
void onWebServiceDataRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState state, int number);
void onWebServiceDataRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState state, int number, const QUrl &url);
//! Validate aircaft
bool validateAircraftValues();

5
src/blackgui/components/modelmatchercomponent.cpp
View File

@@ -200,8 +200,11 @@ namespace BlackGui
ui->tvp_ResultMessages->updateContainer(msgs);
}
void CModelMatcherComponent::onWebDataRead(CEntityFlags::Entity entity, CEntityFlags::ReadState state, int number)
void CModelMatcherComponent::onWebDataRead(CEntityFlags::Entity entity, CEntityFlags::ReadState state, int number, const QUrl &url)
{
Q_UNUSED(url)
if (!sGui || sGui->isShuttingDown()) { return; }
if (number > 0 && entity.testFlag(CEntityFlags::ModelEntity) && CEntityFlags::isFinishedReadState(state))
{
const QStringList modelStrings(sGui->getWebDataServices()->getModelStrings(true));

2
src/blackgui/components/modelmatchercomponent.h
View File

@@ -64,7 +64,7 @@ namespace BlackGui
void onCacheChanged(BlackMisc::Simulation::CSimulatorInfo &simulator);
//! Web data have been read
void onWebDataRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState state, int number);
void onWebDataRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState state, int number, const QUrl &url);
//! Display settings dialog
void displaySettingsDialog();

11
src/blackgui/components/networkdetailscomponent.cpp
View File

@@ -69,7 +69,7 @@ namespace BlackGui
ui->tw_Network->setCurrentIndex(tab);
this->reloadOtherServersSetup();
this->onWebServiceDataRead(CEntityFlags::VatsimDataFile, CEntityFlags::ReadFinished, -1);
this->onWebServiceDataRead(CEntityFlags::VatsimDataFile, CEntityFlags::ReadFinished, -1, {});
}
CNetworkDetailsComponent::~CNetworkDetailsComponent()
@@ -142,7 +142,7 @@ namespace BlackGui
return;
}
Q_UNUSED(index);
Q_UNUSED(index)
const CServer server = this->getCurrentServer();
// only override if not yet enabled
@@ -169,7 +169,7 @@ namespace BlackGui
void CNetworkDetailsComponent::onServerTabWidgetChanged(int index)
{
Q_UNUSED(index);
Q_UNUSED(index)
if (!m_updatePilotOnServerChanges) { return; }
const bool vatsim = this->isVatsimServerSelected();
const CServer server = vatsim ? this->getCurrentVatsimServer() : this->getCurrentOtherServer();
@@ -184,10 +184,11 @@ namespace BlackGui
emit this->overridePilot(server.getUser());
}
void CNetworkDetailsComponent::onWebServiceDataRead(CEntityFlags::Entity entity, CEntityFlags::ReadState state, int number)
void CNetworkDetailsComponent::onWebServiceDataRead(CEntityFlags::Entity entity, CEntityFlags::ReadState state, int number, const QUrl &url)
{
if (!CEntityFlags::isFinishedReadState(state)) { return; }
Q_UNUSED(number);
Q_UNUSED(number)
Q_UNUSED(url)
if (entity == CEntityFlags::VatsimDataFile)
{

2
src/blackgui/components/networkdetailscomponent.h
View File

@@ -134,7 +134,7 @@ namespace BlackGui
void onOverrideCredentialsToPilot();
//! VATSIM data file was loaded
void onWebServiceDataRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState state, int number);
void onWebServiceDataRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState state, int number, const QUrl &url);
//! Change page
void onChangePage();