flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-09 05:28:09 +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

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

@@ -9,12 +9,13 @@
#include "dbaircrafticaoselectorcomponent.h"
#include "ui_dbaircrafticaoselectorcomponent.h"
#include "blackgui/guiutility.h"
#include "blackgui/guiapplication.h"
#include "blackgui/uppercasevalidator.h"
#include "blackmisc/datastoreutility.h"
#include <QMimeData>
using namespace BlackGui;
using namespace BlackCore;
using namespace BlackMisc;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Network;
@@ -31,28 +32,14 @@ namespace BlackGui
this->setAcceptDrops(true);
this->setAcceptedMetaTypeIds({qMetaTypeId<CAircraftIcaoCode>(), qMetaTypeId<CAircraftIcaoCodeList>()});
this->ui->le_Aircraft->setValidator(new CUpperCaseValidator(this));
connect(ui->le_Aircraft, &QLineEdit::returnPressed, this, &CDbAircraftIcaoSelectorComponent::ps_dataChanged);
connect(sApp->getWebDataServices(), &CWebDataServices::dataRead, this, &CDbAircraftIcaoSelectorComponent::ps_codesRead);
this->ps_codesRead(CEntityFlags::AircraftIcaoEntity, CEntityFlags::ReadFinished, sApp->getWebDataServices()->getAircraftIcaoCodesCount());
}
CDbAircraftIcaoSelectorComponent::~CDbAircraftIcaoSelectorComponent()
{ }
void CDbAircraftIcaoSelectorComponent::setProvider(Network::IWebDataServicesProvider *webDataReaderProvider)
{
if (!webDataReaderProvider) { return; }
CWebDataServicesAware::setProvider(webDataReaderProvider);
connectDataReadSignal(
this,
std::bind(&CDbAircraftIcaoSelectorComponent::ps_codesRead, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)
);
int c = this->getAircraftIcaoCodesCount();
if (c > 0)
{
this->ps_codesRead(CEntityFlags::AircraftIcaoEntity, CEntityFlags::ReadFinished, c);
}
}
void CDbAircraftIcaoSelectorComponent::setAircraftIcao(const CAircraftIcaoCode &icao)
{
QString icaoStr(icao.getDesignator());
@@ -67,7 +54,7 @@ namespace BlackGui
void CDbAircraftIcaoSelectorComponent::setAircraftIcao(int key)
{
CAircraftIcaoCode icao(getAircraftIcaoCodeForDbKey(key));
CAircraftIcaoCode icao(sGui->getWebDataServices()->getAircraftIcaoCodeForDbKey(key));
ui->lbl_Description->setText("");
if (icao.hasCompleteData())
{
@@ -83,7 +70,7 @@ namespace BlackGui
{
return CAircraftIcaoCode(text);
}
CAircraftIcaoCode icao(getAircraftIcaoCodeForDbKey(key));
CAircraftIcaoCode icao(sGui->getWebDataServices()->getAircraftIcaoCodeForDbKey(key));
return icao;
}
@@ -149,12 +136,12 @@ namespace BlackGui
void CDbAircraftIcaoSelectorComponent::ps_codesRead(CEntityFlags::Entity entity, CEntityFlags::ReadState readState, int count)
{
if (!hasProvider()) { return; }
if (!sGui) { return; }
if (entity.testFlag(CEntityFlags::AircraftIcaoEntity) && readState == CEntityFlags::ReadFinished)
{
if (count > 0)
{
QCompleter *c = new QCompleter(this->getAircraftIcaoCodes().toCompleterStrings(true, true), this);
QCompleter *c = new QCompleter(sGui->getWebDataServices()->getAircraftIcaoCodes().toCompleterStrings(true, true), this);
c->setCaseSensitivity(Qt::CaseInsensitive);
c->setCompletionMode(QCompleter::PopupCompletion);
c->setMaxVisibleItems(10);
@@ -174,9 +161,9 @@ namespace BlackGui
void CDbAircraftIcaoSelectorComponent::ps_dataChanged()
{
if (!hasProvider()) { return; }
if (!sGui) { return; }
int key = CDatastoreUtility::extractIntegerKey(this->ui->le_Aircraft->text());
CAircraftIcaoCode icao(getAircraftIcaoCodeForDbKey(key));
CAircraftIcaoCode icao(sGui->getWebDataServices()->getAircraftIcaoCodeForDbKey(key));
this->setAircraftIcao(icao);
}