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

refs #602, emoved web service provider

Browse Source 
* webservices now directly accessible via sGui
* interface no longer needed
* no init of provider (setProvider) needed anymore
This commit is contained in:
Klaus Basan
2016-02-25 04:30:08 +01:00
committed by Mathew Sutcliffe
parent a0cfa2e687
commit 79f95845b2
69 changed files with 396 additions and 1453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/blackgui/editors/aircrafticaoform.cpp
View File

@@ -7,6 +7,7 @@
* contained in the LICENSE file.
*/
#include "blackgui/guiapplication.h"
#include "blackgui/guiutility.h"
#include "blackmisc/aviation/aircrafticaocodelist.h"
#include "aircrafticaoform.h"
@@ -73,7 +74,7 @@ namespace BlackGui
if (k >= 0)
{
// we got an id, we get the DB object for it
CAircraftIcaoCode fromDb(this->getAircraftIcaoCodeForDbKey(k));
CAircraftIcaoCode fromDb(sGui->getWebDataServices()->getAircraftIcaoCodeForDbKey(k));
if (fromDb.getDesignator() == icao.getDesignator())
{
// we replace by DB object
@@ -152,12 +153,6 @@ namespace BlackGui
setValue(CAircraftIcaoCode());
}
void CAircraftIcaoForm::setProvider(Network::IWebDataServicesProvider *webDataReaderProvider)
{
CWebDataServicesAware::setProvider(webDataReaderProvider);
this->ui->aircraft_Selector->setProvider(webDataReaderProvider);
}
void CAircraftIcaoForm::ps_droppedCode(const BlackMisc::CVariant &variantDropped)
{
CAircraftIcaoCode icao;

7
src/blackgui/editors/aircrafticaoform.h
View File

@@ -15,7 +15,6 @@
#include "blackgui/blackguiexport.h"
#include "blackgui/editors/form.h"
#include "blackmisc/aviation/aircrafticaocode.h"
#include "blackmisc/network/webdataservicesprovider.h"
#include "blackmisc/statusmessagelist.h"
#include <QScopedPointer>
@@ -29,8 +28,7 @@ namespace BlackGui
* Aircraft ICAO form
*/
class BLACKGUI_EXPORT CAircraftIcaoForm :
public CForm,
public BlackMisc::Network::CWebDataServicesAware
public CForm
{
Q_OBJECT
@@ -62,9 +60,6 @@ namespace BlackGui
//! Clear
void clear();
//! \copydoc BlackMisc::Network::CWebDataServicesAware::setProvider
virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *webDataReaderProvider) override;
public slots:
//! Set value
void setValue(const BlackMisc::Aviation::CAircraftIcaoCode &icao);

9
src/blackgui/editors/airlineicaoform.cpp
View File

@@ -22,7 +22,6 @@ namespace BlackGui
{
CAirlineIcaoForm::CAirlineIcaoForm(QWidget *parent) :
CForm(parent),
BlackMisc::Network::CWebDataServicesAware(nullptr),
ui(new Ui::CAirlineIcaoForm)
{
ui->setupUi(this);
@@ -119,14 +118,6 @@ namespace BlackGui
setValue(CAirlineIcaoCode());
}
void CAirlineIcaoForm::setProvider(Network::IWebDataServicesProvider *webDataReaderProvider)
{
CWebDataServicesAware::setProvider(webDataReaderProvider);
this->ui->country_Selector->setProvider(webDataReaderProvider);
this->ui->selector_AirlineDesignator->setProvider(webDataReaderProvider);
this->ui->selector_AirlineName->setProvider(webDataReaderProvider);
}
void CAirlineIcaoForm::ps_droppedCode(const BlackMisc::CVariant &variantDropped)
{
CAirlineIcaoCode icao;

7
src/blackgui/editors/airlineicaoform.h
View File

@@ -14,7 +14,6 @@
#include "blackgui/blackguiexport.h"
#include "blackmisc/aviation/airlineicaocode.h"
#include "blackmisc/network/webdataservicesprovider.h"
#include "blackmisc/statusmessagelist.h"
#include "blackgui/editors/form.h"
#include <QScopedPointer>
@@ -29,8 +28,7 @@ namespace BlackGui
* Airline ICAO code form
*/
class BLACKGUI_EXPORT CAirlineIcaoForm :
public CForm,
public BlackMisc::Network::CWebDataServicesAware
public CForm
{
Q_OBJECT
@@ -65,9 +63,6 @@ namespace BlackGui
//! Clear
void clear();
//! \copydoc BlackMisc::Network::CWebDataServicesAware::setProvider
virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *webDataReaderProvider) override;
signals:
//! Airline has been changed
void airlineChanged(const BlackMisc::Aviation::CAirlineIcaoCode &airlineIcao);

7
src/blackgui/editors/distributorform.cpp
View File

@@ -22,7 +22,6 @@ namespace BlackGui
{
CDistributorForm::CDistributorForm(QWidget *parent) :
CForm(parent),
BlackMisc::Network::CWebDataServicesAware(nullptr),
ui(new Ui::CDistributorForm)
{
ui->setupUi(this);
@@ -101,12 +100,6 @@ namespace BlackGui
this->ui->distributor_Selector->setReadOnly(false);
}
void CDistributorForm::setProvider(Network::IWebDataServicesProvider *webDataReaderProvider)
{
CWebDataServicesAware::setProvider(webDataReaderProvider);
this->ui->distributor_Selector->setProvider(webDataReaderProvider);
}
void CDistributorForm::ps_droppedCode(const BlackMisc::CVariant &variantDropped)
{
CDistributor distributor;

7
src/blackgui/editors/distributorform.h
View File

@@ -15,7 +15,6 @@
#include "blackgui/blackguiexport.h"
#include "blackgui/editors/form.h"
#include "blackmisc/simulation/distributor.h"
#include "blackmisc/network/webdataservicesprovider.h"
#include "blackmisc/statusmessagelist.h"
#include <QScopedPointer>
@@ -29,8 +28,7 @@ namespace BlackGui
* Distributor form
*/
class BLACKGUI_EXPORT CDistributorForm :
public CForm,
public BlackMisc::Network::CWebDataServicesAware
public CForm
{
Q_OBJECT
@@ -62,9 +60,6 @@ namespace BlackGui
//! Clear
void clear();
//! \copydoc BlackMisc::Network::CWebDataServicesAware::setProvider
virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *webDataReaderProvider) override;
public slots:
//! Set value
void setValue(const BlackMisc::Simulation::CDistributor &distributor = BlackMisc::Simulation::CDistributor());

11
src/blackgui/editors/liveryform.cpp
View File

@@ -7,12 +7,14 @@
* contained in the LICENSE file.
*/
#include "blackgui/guiapplication.h"
#include "blackmisc/aviation/liverylist.h"
#include "liveryform.h"
#include "ui_liveryform.h"
using namespace BlackMisc;
using namespace BlackMisc::Aviation;
using namespace BlackGui;
using namespace BlackGui::Components;
namespace BlackGui
@@ -43,13 +45,6 @@ namespace BlackGui
CLiveryForm::~CLiveryForm() { }
void CLiveryForm::setProvider(BlackMisc::Network::IWebDataServicesProvider *provider)
{
CWebDataServicesAware::setProvider(provider);
this->ui->editor_AirlineIcao->setProvider(provider);
this->ui->livery_Selector->setProvider(provider);
}
CLivery CLiveryForm::getValue() const
{
CLivery livery(this->ui->livery_Selector->getLivery());
@@ -168,7 +163,7 @@ namespace BlackGui
if (!code.hasCompleteData()) { return; }
if (!code.hasValidDbKey()) { return; }
CLivery stdLivery(this->getLiveries().findStdLiveryByAirlineIcaoDesignator(code));
CLivery stdLivery(sGui->getWebDataServices()->getLiveries().findStdLiveryByAirlineIcaoDesignator(code));
if (stdLivery.hasValidDbKey())
{
this->setValue(stdLivery);

7
src/blackgui/editors/liveryform.h
View File

@@ -15,7 +15,6 @@
#include "blackgui/editors/form.h"
#include "blackgui/blackguiexport.h"
#include "blackmisc/aviation/livery.h"
#include "blackmisc/network/webdataservicesprovider.h"
#include "blackmisc/statusmessagelist.h"
namespace Ui { class CLiveryForm; }
@@ -28,8 +27,7 @@ namespace BlackGui
* Livery form class
*/
class BLACKGUI_EXPORT CLiveryForm :
public CForm,
public BlackMisc::Network::CWebDataServicesAware
public CForm
{
Q_OBJECT
@@ -40,9 +38,6 @@ namespace BlackGui
//! Destructor
~CLiveryForm();
//! \copydoc BlackMisc::Network::CWebDataServicesAware::setProvider
virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *provider) override;
//! Value
BlackMisc::Aviation::CLivery getValue() const;