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

Ref T515, mapping component improvements

Browse Source 
* allow to re-display validation dialog
* highlight disabled models
This commit is contained in:
Klaus Basan
2019-01-23 17:10:00 +01:00
committed by Mat Sutcliffe
parent 6644927943
commit 583a5bfb28
7 changed files with 147 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/swiftguistandard/swiftguistd.cpp
View File

@@ -310,7 +310,7 @@ void SwiftGuiStd::setContextAvailability()
this->displayDBusReconnectDialog();
}
m_contextNetworkAvailable = m_coreAvailable && sGui->getIContextNetwork() && !sGui->getIContextNetwork()->isEmptyObject();
m_contextAudioAvailable = m_coreAvailable && sGui->getIContextAudio() && !sGui->getIContextAudio()->isEmptyObject();
m_contextAudioAvailable = m_coreAvailable && sGui->getIContextAudio() && !sGui->getIContextAudio()->isEmptyObject();
// react to a change in core's availability
if (m_coreAvailable != corePreviouslyAvailable)
@@ -437,15 +437,23 @@ void SwiftGuiStd::verifyPrerequisites()
}
void SwiftGuiStd::onValidatedModelSet(const CSimulatorInfo &simulator, const CAircraftModelList &valid, const CAircraftModelList &invalid, bool stopped, const CStatusMessageList &msgs)
{
this->displayValidationDialog();
m_validationDialog->validatedModelSet(simulator, valid, invalid, stopped, msgs);
// modal version
// const int r = m_validationDialog->exec();
// Q_UNUSED(r);
}
void SwiftGuiStd::displayValidationDialog()
{
if (!sGui || sGui->isShuttingDown()) { return; }
if (!m_validationDialog)
{
m_validationDialog.reset(new CAircraftModelSetValidationDialog(this));
}
m_validationDialog->validatedModelSet(simulator, valid, invalid, stopped, msgs);
const int r = m_validationDialog->exec();
Q_UNUSED(r);
m_validationDialog->show();
}
void SwiftGuiStd::checkDbDataLoaded()

3
src/swiftguistandard/swiftguistd.h
View File

@@ -272,6 +272,9 @@ private:
//! Model set haas been verfied
void onValidatedModelSet(const BlackMisc::Simulation::CSimulatorInfo &simulator, const BlackMisc::Simulation::CAircraftModelList &valid, const BlackMisc::Simulation::CAircraftModelList &invalid, bool stopped, const BlackMisc::CStatusMessageList &msgs);
//! Display validation dialog
void displayValidationDialog();
//! Ckeck if the DB data have been loaded
void checkDbDataLoaded();

7
src/swiftguistandard/swiftguistdinit.cpp
View File

@@ -235,10 +235,10 @@ void SwiftGuiStd::initGuiSignals()
connect(sGui, &CGuiApplication::styleSheetsChanged, this, &SwiftGuiStd::onStyleSheetsChanged, Qt::QueuedConnection);
// login
connect(ui->comp_Login, &CLoginComponent::loginOrLogoffCancelled, this, &SwiftGuiStd::setMainPageToInfoArea);
connect(ui->comp_Login, &CLoginComponent::loginOrLogoffCancelled, this, &SwiftGuiStd::setMainPageToInfoArea);
connect(ui->comp_Login, &CLoginComponent::loginOrLogoffSuccessful, this, &SwiftGuiStd::setMainPageToInfoArea);
connect(ui->comp_Login, &CLoginComponent::loginOrLogoffSuccessful, ui->comp_MainInfoArea->getFlightPlanComponent(), &CFlightPlanComponent::loginDataSet);
connect(ui->comp_Login, &CLoginComponent::loginDataChangedDigest, ui->comp_MainInfoArea->getFlightPlanComponent(), &CFlightPlanComponent::loginDataSet);
connect(ui->comp_Login, &CLoginComponent::loginDataChangedDigest, ui->comp_MainInfoArea->getFlightPlanComponent(), &CFlightPlanComponent::loginDataSet);
connect(ui->comp_Login, &CLoginComponent::requestNetworkSettings, [ this ]()
{
if (!sApp || sApp->isShuttingDown()) { return; }
@@ -258,7 +258,8 @@ void SwiftGuiStd::initGuiSignals()
connect(ui->comp_MainInfoArea->getAircraftComponent(), &CAircraftComponent::requestTextMessageWidget, ui->comp_MainInfoArea->getTextMessageComponent(), &CTextMessageComponent::showCorrespondingTab);
connect(ui->comp_MainInfoArea->getUserComponent(), &CUserComponent::requestTextMessageWidget, ui->comp_MainInfoArea->getTextMessageComponent(), &CTextMessageComponent::showCorrespondingTab);
// interpolation
// interpolation and validation
connect(ui->comp_MainInfoArea->getMappingComponent(), &CMappingComponent::requestValidationDialog, this, &SwiftGuiStd::displayValidationDialog);
connect(ui->comp_MainInfoArea->getInterpolationComponent(), &CInterpolationComponent::requestRenderingRestrictionsWidget, [ = ]
{
this->setSettingsPage(CSettingsComponent::SettingTabSimulator);