flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 23:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T515, display onValidatedModelSet results in UI

Browse Source
This commit is contained in:
Klaus Basan
2019-01-21 09:01:46 +01:00
committed by Mat Sutcliffe
parent 7ef7fb3449
commit 6acde8799f
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/swiftguistandard/swiftguistd.cpp
View File

@@ -436,6 +436,18 @@ void SwiftGuiStd::verifyPrerequisites()
this->copyXSwiftBusDialog(true);
}
void SwiftGuiStd::onValidatedModelSet(const CSimulatorInfo &simulator, const CAircraftModelList &valid, const CAircraftModelList &invalid, bool stopped, const CStatusMessageList &msgs)
{
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);
}
void SwiftGuiStd::checkDbDataLoaded()
{
if (!sGui || sGui->isShuttingDown()) { return; }

7
src/swiftguistandard/swiftguistd.h
View File

@@ -18,6 +18,7 @@
#include "blackgui/components/maininfoareacomponent.h"
#include "blackgui/components/navigatordialog.h"
#include "blackgui/components/aircraftmodelsetvalidationdialog.h"
#include "blackgui/enableforframelesswindow.h"
#include "blackgui/mainwindowaccess.h"
#include "blackgui/managedstatusbar.h"
@@ -99,8 +100,9 @@ protected:
private:
QScopedPointer<Ui::SwiftGuiStd> ui;
QScopedPointer<BlackGui::Components::CNavigatorDialog> m_navigator{ new BlackGui::Components::CNavigatorDialog() }; //!< navigator dialog bar, if I pass the parent, the dialog is always centered over the parent
QScopedPointer<BlackGui::Components::CNavigatorDialog> m_navigator{ new BlackGui::Components::CNavigatorDialog() }; //!< navigator dialog bar, if I pass the parent, the dialog is always centered over the parent
QScopedPointer<BlackGui::Components::CDbLoadDataDialog> m_dbLoadDialog; //!< load DB data, lazy init UI component
QScopedPointer<BlackGui::Components::CAircraftModelSetValidationDialog> m_validationDialog; //!< aircraft model validation dialog
BlackCore::CActionBind m_actionPtt { "/Voice/Activate push-to-talk", BlackMisc::CIcons::radio16(), this, &SwiftGuiStd::onPttChanged };
BlackCore::CActionBindings m_menuHotkeyHandlers;
BlackGui::CManagedStatusBar m_statusBar;
@@ -267,6 +269,9 @@ private:
//! Checks if model set is available
void verifyPrerequisites();
//! 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);
//! Ckeck if the DB data have been loaded
void checkDbDataLoaded();

2
src/swiftguistandard/swiftguistdinit.cpp
View File

@@ -131,6 +131,8 @@ void SwiftGuiStd::init()
Q_ASSERT(s);
s = connect(sGui->getIContextSimulator(), &IContextSimulator::requestUiConsoleMessage, this, &SwiftGuiStd::onRequestedConsoleMessage, Qt::QueuedConnection);
Q_ASSERT(s);
s = connect(sGui->getIContextSimulator(), &IContextSimulator::validatedModelSet, this, &SwiftGuiStd::onValidatedModelSet, Qt::QueuedConnection);
Q_ASSERT(s);
s = connect(&m_timerContextWatchdog, &QTimer::timeout, this, &SwiftGuiStd::handleTimerBasedUpdates);
Q_ASSERT(s);
Q_UNUSED(s);