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

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

@@ -9,6 +9,7 @@
#include "ui_dbliverycomponent.h"
#include "dbliverycomponent.h"
#include "blackgui/guiapplication.h"
#include "blackcore/webdataservices.h"
#include <functional>
@@ -31,25 +32,14 @@ namespace BlackGui
// filter and drag and drop
this->ui->tvp_Liveries->setFilterWidget(this->ui->filter_Livery);
this->ui->tvp_Liveries->allowDragDropValueObjects(true, false);
connect(sGui->getWebDataServices(), &CWebDataServices::dataRead, this, &CDbLiveryComponent::ps_liveriesRead);
this->ps_liveriesRead(CEntityFlags::LiveryEntity, CEntityFlags::ReadFinished, sGui->getWebDataServices()->getLiveriesCount());
}
CDbLiveryComponent::~CDbLiveryComponent()
{ }
void CDbLiveryComponent::setProvider(IWebDataServicesProvider *webDataReaderProvider)
{
CWebDataServicesAware::setProvider(webDataReaderProvider);
connectDataReadSignal(
this,
std::bind(&CDbLiveryComponent::ps_liveriesRead, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)
);
int c = getLiveriesCount();
if (c > 0)
{
ps_liveriesRead(CEntityFlags::LiveryEntity, CEntityFlags::ReadFinished, c);
}
}
void CDbLiveryComponent::filter(const BlackMisc::Aviation::CLivery &livery)
{
this->ui->filter_Livery->filter(livery);
@@ -60,14 +50,14 @@ namespace BlackGui
Q_UNUSED(count);
if (entity.testFlag(CEntityFlags::LiveryEntity) && readState == CEntityFlags::ReadFinished)
{
this->ui->tvp_Liveries->updateContainerMaybeAsync(this->getLiveries());
this->ui->tvp_Liveries->updateContainerMaybeAsync(sGui->getWebDataServices()->getLiveries());
}
}
void CDbLiveryComponent::ps_reload()
{
if (!hasProvider()) { return; }
triggerRead(CEntityFlags::LiveryEntity, QDateTime());
if (!sGui) { return; }
sGui->getWebDataServices()->triggerRead(CEntityFlags::LiveryEntity);
}
} // ns