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

Ref T226, renamed to swiftDbAllDataRead

Browse Source
This commit is contained in:
Klaus Basan
2018-01-31 08:35:30 +01:00
parent 5aad426ced
commit bb65b7c280
8 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/context/contextownaircraftimpl.cpp
View File

@@ -62,7 +62,7 @@ namespace BlackCore
if (sApp && sApp->getWebDataServices()) if (sApp && sApp->getWebDataServices())
{ {
connect(sApp->getWebDataServices(), &CWebDataServices::allSwiftDbDataRead, this, &CContextOwnAircraft::allSwiftWebDataRead); connect(sApp->getWebDataServices(), &CWebDataServices::swiftDbAllDataRead, this, &CContextOwnAircraft::allSwiftWebDataRead);
} }
// Init own aircraft // Init own aircraft

2
src/blackcore/simulatorcommon.cpp
View File

@@ -79,7 +79,7 @@ namespace BlackCore
// swift data // swift data
if (sApp && sApp->hasWebDataServices()) if (sApp && sApp->hasWebDataServices())
{ {
connect(sApp->getWebDataServices(), &CWebDataServices::allSwiftDbDataRead, this, &CSimulatorCommon::onSwiftDbAllDataRead, Qt::QueuedConnection); connect(sApp->getWebDataServices(), &CWebDataServices::swiftDbAllDataRead, this, &CSimulatorCommon::onSwiftDbAllDataRead, Qt::QueuedConnection);
connect(sApp->getWebDataServices(), &CWebDataServices::swiftDbAirportsRead, this, &CSimulatorCommon::onSwiftDbAirportsRead, Qt::QueuedConnection); connect(sApp->getWebDataServices(), &CWebDataServices::swiftDbAirportsRead, this, &CSimulatorCommon::onSwiftDbAirportsRead, Qt::QueuedConnection);
connect(sApp->getWebDataServices(), &CWebDataServices::swiftDbModelMatchingEntitiesRead, this, &CSimulatorCommon::onSwiftDbModelMatchingEntitiesRead, Qt::QueuedConnection); connect(sApp->getWebDataServices(), &CWebDataServices::swiftDbModelMatchingEntitiesRead, this, &CSimulatorCommon::onSwiftDbModelMatchingEntitiesRead, Qt::QueuedConnection);
} }

2
src/blackcore/webdataservices.cpp
View File

@@ -1248,7 +1248,7 @@ namespace BlackCore
const int allUsedEntities = static_cast<int>(this->allDbEntitiesForUsedReaders()); const int allUsedEntities = static_cast<int>(this->allDbEntitiesForUsedReaders());
if (((static_cast<int>(m_swiftDbEntitiesRead)) & allUsedEntities) == allUsedEntities) if (((static_cast<int>(m_swiftDbEntitiesRead)) & allUsedEntities) == allUsedEntities)
{ {
emit this->allSwiftDbDataRead(); emit this->swiftDbAllDataRead();
} }
// individual signals // individual signals

2
src/blackcore/webdataservices.h
View File

@@ -472,7 +472,7 @@ namespace BlackCore
//! \name Simplified read signals //! \name Simplified read signals
//! @{ //! @{
//! All swift DB data have been read //! All swift DB data have been read
void allSwiftDbDataRead(); void swiftDbAllDataRead();
//! Shared info objects read //! Shared info objects read
void sharedInfoObjectsRead(); void sharedInfoObjectsRead();

14
src/blackgui/components/aircraftcombinedtypeselector.cpp
View File

@@ -28,12 +28,12 @@ namespace BlackGui
ui(new Ui::CAircraftCombinedTypeSelector) ui(new Ui::CAircraftCombinedTypeSelector)
{ {
ui->setupUi(this); ui->setupUi(this);
connect(ui->le_CombinedType, &QLineEdit::editingFinished, this, &CAircraftCombinedTypeSelector::ps_CombinedTypeEntered); connect(ui->le_CombinedType, &QLineEdit::editingFinished, this, &CAircraftCombinedTypeSelector::combinedTypeEntered);
connect(ui->le_CombinedType, &QLineEdit::returnPressed, this, &CAircraftCombinedTypeSelector::ps_CombinedTypeEntered); connect(ui->le_CombinedType, &QLineEdit::returnPressed, this, &CAircraftCombinedTypeSelector::combinedTypeEntered);
connect(ui->cb_EngineCount, &QComboBox::currentTextChanged, this, &CAircraftCombinedTypeSelector::ps_ChangedComboBox); connect(ui->cb_EngineCount, &QComboBox::currentTextChanged, this, &CAircraftCombinedTypeSelector::changedComboBox);
connect(ui->cb_EngineType, &QComboBox::currentTextChanged, this, &CAircraftCombinedTypeSelector::ps_ChangedComboBox); connect(ui->cb_EngineType, &QComboBox::currentTextChanged, this, &CAircraftCombinedTypeSelector::changedComboBox);
connect(ui->cb_Type, &QComboBox::currentTextChanged, this, &CAircraftCombinedTypeSelector::ps_ChangedComboBox); connect(ui->cb_Type, &QComboBox::currentTextChanged, this, &CAircraftCombinedTypeSelector::changedComboBox);
ui->le_CombinedType->setValidator(new CUpperCaseValidator(this)); ui->le_CombinedType->setValidator(new CUpperCaseValidator(this));
} }
@@ -84,13 +84,13 @@ namespace BlackGui
return ct2; return ct2;
} }
void CAircraftCombinedTypeSelector::ps_CombinedTypeEntered() void CAircraftCombinedTypeSelector::combinedTypeEntered()
{ {
QString cc(ui->le_CombinedType->text().trimmed().toUpper()); QString cc(ui->le_CombinedType->text().trimmed().toUpper());
this->setCombinedType(cc); this->setCombinedType(cc);
} }
void CAircraftCombinedTypeSelector::ps_ChangedComboBox(const QString &text) void CAircraftCombinedTypeSelector::changedComboBox(const QString &text)
{ {
Q_UNUSED(text); Q_UNUSED(text);
QString ct(getCombinedTypeFromComboBoxes()); QString ct(getCombinedTypeFromComboBoxes());

9
src/blackgui/components/aircraftcombinedtypeselector.h
View File

@@ -40,7 +40,7 @@ namespace BlackGui
explicit CAircraftCombinedTypeSelector(QWidget *parent = nullptr); explicit CAircraftCombinedTypeSelector(QWidget *parent = nullptr);
//! Destructor //! Destructor
~CAircraftCombinedTypeSelector(); virtual ~CAircraftCombinedTypeSelector();
//! Set comined code, e.g. L1P //! Set comined code, e.g. L1P
void setCombinedType(const QString &combinedCode); void setCombinedType(const QString &combinedCode);
@@ -57,14 +57,13 @@ namespace BlackGui
//! Get the combined type, e.g. "L2P" //! Get the combined type, e.g. "L2P"
QString getCombinedType() const; QString getCombinedType() const;
private slots: private:
//! Code has been entered //! Code has been entered
void ps_CombinedTypeEntered(); void combinedTypeEntered();
//! Changed combobox //! Changed combobox
void ps_ChangedComboBox(const QString &text); void changedComboBox(const QString &text);
private:
//! Combined type from comboboxes //! Combined type from comboboxes
QString getCombinedTypeFromComboBoxes() const; QString getCombinedTypeFromComboBoxes() const;

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

@@ -45,7 +45,7 @@ namespace BlackGui
ui->editor_AircraftModel->allowDrop(false); ui->editor_AircraftModel->allowDrop(false);
ui->editor_AircraftModel->setReadOnly(true); ui->editor_AircraftModel->setReadOnly(true);
connect(sGui->getWebDataServices(), &CWebDataServices::allSwiftDbDataRead, this, &CDbQuickMappingWizard::ps_webDataRead); connect(sGui->getWebDataServices(), &CWebDataServices::swiftDbAllDataRead, this, &CDbQuickMappingWizard::ps_webDataRead);
connect(sGui->getWebDataServices()->getDatabaseWriter(), &CDatabaseWriter::publishedModels, this, &CDbQuickMappingWizard::ps_publishedModels); connect(sGui->getWebDataServices()->getDatabaseWriter(), &CDatabaseWriter::publishedModels, this, &CDbQuickMappingWizard::ps_publishedModels);
connect(this, &CDbQuickMappingWizard::currentIdChanged, this, &CDbQuickMappingWizard::ps_currentWizardPageChanged); connect(this, &CDbQuickMappingWizard::currentIdChanged, this, &CDbQuickMappingWizard::ps_currentWizardPageChanged);

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

@@ -133,7 +133,7 @@ namespace BlackGui
connect(ui->cb_Tcas, &QCheckBox::released, this, &CFlightPlanComponent::prefixCheckBoxChanged); connect(ui->cb_Tcas, &QCheckBox::released, this, &CFlightPlanComponent::prefixCheckBoxChanged);
// web services // web services
connect(sGui->getWebDataServices(), &CWebDataServices::allSwiftDbDataRead, this, &CFlightPlanComponent::swiftWebDataRead); connect(sGui->getWebDataServices(), &CWebDataServices::swiftDbAllDataRead, this, &CFlightPlanComponent::swiftWebDataRead);
// init GUI // init GUI
this->resetFlightPlan(); this->resetFlightPlan();