From 80bbed96d4796e2155e7aa29180d8ff53acb2f09 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 17 Oct 2016 03:23:11 +0200 Subject: [PATCH] refs #768, allow to access view and filter of components (required in wizard) --- src/blackgui/components/dbaircrafticaocomponent.cpp | 6 +++++- src/blackgui/components/dbaircrafticaocomponent.h | 6 ++++-- src/blackgui/components/dbairlineicaocomponent.cpp | 5 +++++ src/blackgui/components/dbairlineicaocomponent.h | 5 ++++- src/blackgui/components/dbdistributorcomponent.cpp | 5 +++++ src/blackgui/components/dbdistributorcomponent.h | 7 ++++--- src/blackgui/components/dbliverycomponent.cpp | 11 ++++++++++- src/blackgui/components/dbliverycomponent.h | 11 +++++++++-- 8 files changed, 46 insertions(+), 10 deletions(-) diff --git a/src/blackgui/components/dbaircrafticaocomponent.cpp b/src/blackgui/components/dbaircrafticaocomponent.cpp index 156348d0e..bbeb1a5ed 100644 --- a/src/blackgui/components/dbaircrafticaocomponent.cpp +++ b/src/blackgui/components/dbaircrafticaocomponent.cpp @@ -48,6 +48,11 @@ namespace BlackGui CDbAircraftIcaoComponent::~CDbAircraftIcaoComponent() { } + BlackGui::Views::CAircraftIcaoCodeView *CDbAircraftIcaoComponent::view() const + { + return ui->tvp_AircraftIcao; + } + void CDbAircraftIcaoComponent::filter(const CAircraftIcaoCode &icao) { ui->filter_AircraftIcao->filter(icao); @@ -67,6 +72,5 @@ namespace BlackGui if (!sGui) { return; } sGui->getWebDataServices()->triggerReloadFromDb(CEntityFlags::AircraftIcaoEntity, QDateTime()); } - } // ns } // ns diff --git a/src/blackgui/components/dbaircrafticaocomponent.h b/src/blackgui/components/dbaircrafticaocomponent.h index 41d0a91aa..138d217f3 100644 --- a/src/blackgui/components/dbaircrafticaocomponent.h +++ b/src/blackgui/components/dbaircrafticaocomponent.h @@ -22,12 +22,11 @@ #include class QWidget; - namespace BlackMisc { namespace Aviation { class CAircraftIcaoCode; } } namespace Ui { class CDbAircraftIcaoComponent; } - namespace BlackGui { + namespace Views { class CAircraftIcaoCodeView; } namespace Components { /** @@ -47,6 +46,9 @@ namespace BlackGui //! Destructor ~CDbAircraftIcaoComponent(); + //! Get the view + BlackGui::Views::CAircraftIcaoCodeView *view() const; + public slots: //! Filter by ICAO as default void filter(const BlackMisc::Aviation::CAircraftIcaoCode &icao); diff --git a/src/blackgui/components/dbairlineicaocomponent.cpp b/src/blackgui/components/dbairlineicaocomponent.cpp index 3fb32691d..5bc3c4e9c 100644 --- a/src/blackgui/components/dbairlineicaocomponent.cpp +++ b/src/blackgui/components/dbairlineicaocomponent.cpp @@ -46,6 +46,11 @@ namespace BlackGui CDbAirlineIcaoComponent::~CDbAirlineIcaoComponent() { } + BlackGui::Views::CAirlineIcaoCodeView *CDbAirlineIcaoComponent::view() const + { + return ui->tvp_AirlineIcao; + } + void CDbAirlineIcaoComponent::ps_icaoRead(CEntityFlags::Entity entity, CEntityFlags::ReadState readState, int count) { Q_UNUSED(count); diff --git a/src/blackgui/components/dbairlineicaocomponent.h b/src/blackgui/components/dbairlineicaocomponent.h index 345a876dd..fc2762c4b 100644 --- a/src/blackgui/components/dbairlineicaocomponent.h +++ b/src/blackgui/components/dbairlineicaocomponent.h @@ -24,9 +24,9 @@ class QWidget; namespace Ui { class CDbAirlineIcaoComponent; } - namespace BlackGui { + namespace Views { class CAirlineIcaoCodeView; } namespace Components { /** @@ -46,6 +46,9 @@ namespace BlackGui //! Destructor ~CDbAirlineIcaoComponent(); + //! Get the view + BlackGui::Views::CAirlineIcaoCodeView *view() const; + private slots: //! ICAO codes have been read void ps_icaoRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState readState, int count); diff --git a/src/blackgui/components/dbdistributorcomponent.cpp b/src/blackgui/components/dbdistributorcomponent.cpp index a464e699c..84088f104 100644 --- a/src/blackgui/components/dbdistributorcomponent.cpp +++ b/src/blackgui/components/dbdistributorcomponent.cpp @@ -43,6 +43,11 @@ namespace BlackGui CDbDistributorComponent::~CDbDistributorComponent() { } + CDistributorView *CDbDistributorComponent::view() const + { + return ui->tvp_Distributors; + } + void CDbDistributorComponent::ps_distributorsRead(CEntityFlags::Entity entity, CEntityFlags::ReadState readState, int count) { Q_UNUSED(count); diff --git a/src/blackgui/components/dbdistributorcomponent.h b/src/blackgui/components/dbdistributorcomponent.h index bda8b4127..98145981a 100644 --- a/src/blackgui/components/dbdistributorcomponent.h +++ b/src/blackgui/components/dbdistributorcomponent.h @@ -16,17 +16,15 @@ #include "blackgui/components/enablefordockwidgetinfoarea.h" #include "blackgui/enableforviewbasedindicator.h" #include "blackmisc/network/entityflags.h" - #include #include #include class QWidget; - namespace Ui { class CDbDistributorComponent; } - namespace BlackGui { + namespace Views { class CDistributorView; } namespace Components { /** @@ -46,6 +44,9 @@ namespace BlackGui //! Destructor ~CDbDistributorComponent(); + //! Get the view + BlackGui::Views::CDistributorView *view() const; + private slots: //! Distributors have been read void ps_distributorsRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState readState, int count); diff --git a/src/blackgui/components/dbliverycomponent.cpp b/src/blackgui/components/dbliverycomponent.cpp index 977195054..6a0d09b5c 100644 --- a/src/blackgui/components/dbliverycomponent.cpp +++ b/src/blackgui/components/dbliverycomponent.cpp @@ -44,11 +44,21 @@ namespace BlackGui CDbLiveryComponent::~CDbLiveryComponent() { } + CLiveryView *CDbLiveryComponent::view() + { + return ui->tvp_Liveries; + } + void CDbLiveryComponent::filter(const BlackMisc::Aviation::CLivery &livery) { ui->filter_Livery->filter(livery); } + void CDbLiveryComponent::filterByAirline(const BlackMisc::Aviation::CAirlineIcaoCode &icao) + { + ui->filter_Livery->filter(icao); + } + void CDbLiveryComponent::ps_liveriesRead(CEntityFlags::Entity entity, CEntityFlags::ReadState readState, int count) { Q_UNUSED(count); @@ -63,7 +73,6 @@ namespace BlackGui if (!sGui) { return; } sGui->getWebDataServices()->triggerReloadFromDb(CEntityFlags::LiveryEntity); } - } // ns } // ns diff --git a/src/blackgui/components/dbliverycomponent.h b/src/blackgui/components/dbliverycomponent.h index 340caa0bb..8fcf17569 100644 --- a/src/blackgui/components/dbliverycomponent.h +++ b/src/blackgui/components/dbliverycomponent.h @@ -16,6 +16,7 @@ #include "blackgui/components/enablefordockwidgetinfoarea.h" #include "blackgui/enableforviewbasedindicator.h" #include "blackmisc/network/entityflags.h" +#include "blackmisc/aviation/airlineicaocode.h" #include #include @@ -25,9 +26,9 @@ class QWidget; namespace BlackMisc { namespace Aviation { class CLivery; } } namespace Ui { class CDbLiveryComponent; } - namespace BlackGui { + namespace Views { class CLiveryView; } namespace Components { /*! @@ -47,10 +48,16 @@ namespace BlackGui //! Destructor virtual ~CDbLiveryComponent(); + //! The livery view + BlackGui::Views::CLiveryView *view(); + public slots: - //! Filter by livery as default + //! Filter by livery void filter(const BlackMisc::Aviation::CLivery &livery); + //! Filter by airline ICAO + void filterByAirline(const BlackMisc::Aviation::CAirlineIcaoCode &icao); + private slots: //! Liveries codes have been read void ps_liveriesRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState readState, int count);