mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-14 08:45:36 +08:00
Ref T658, adjusted usage of matching script in matcher component (for testing)
* fixed matching messages to display also the reverse lookup messages * utility function for matching
This commit is contained in:
committed by
Mat Sutcliffe
parent
a58204ad9e
commit
502e9e10d2
@@ -13,10 +13,12 @@
|
||||
|
||||
#include "blackcore/aircraftmatcher.h"
|
||||
#include "blackgui/blackguiexport.h"
|
||||
#include "blackmisc/network/entityflags.h"
|
||||
#include "blackmisc/simulation/settings/modelmatchersettings.h"
|
||||
#include "blackmisc/simulation/aircraftmodel.h"
|
||||
#include "blackmisc/simulation/simulatedaircraft.h"
|
||||
#include "blackmisc/simulation/simulatorinfo.h"
|
||||
#include "blackmisc/network/entityflags.h"
|
||||
#include "blackmisc/settingscache.h"
|
||||
|
||||
#include <QFrame>
|
||||
#include <QObject>
|
||||
@@ -91,11 +93,14 @@ namespace BlackGui
|
||||
//! Pseudo default aircraft
|
||||
BlackMisc::Simulation::CAircraftModel defaultModel() const;
|
||||
|
||||
QScopedPointer<Ui::CModelMatcherComponent> ui;
|
||||
//! Run matching script
|
||||
static BlackMisc::Simulation::MSReturnValues matchingScript(const BlackMisc::Simulation::CAircraftModel &inModel, const BlackMisc::Simulation::CAircraftMatcherSetup &setup, BlackMisc::CStatusMessageList &msgs);
|
||||
|
||||
QScopedPointer<Ui::CModelMatcherComponent> ui;
|
||||
QPointer<Views::CAircraftModelView> m_workbenchView; //!< an external workbenc
|
||||
CSettingsMatchingDialog *m_settingsDialog = nullptr; //!< matching settings as dialog
|
||||
BlackCore::CAircraftMatcher m_matcher { this }; //!< used matcher
|
||||
CSettingsMatchingDialog *m_settingsDialog = nullptr; //!< matching settings as dialog
|
||||
BlackCore::CAircraftMatcher m_matcher { this }; //!< used matcher
|
||||
BlackMisc::CSettingReadOnly<BlackMisc::Simulation::Settings::TModelMatching> m_matchingSettings { this }; //!< settings
|
||||
};
|
||||
} // ns
|
||||
} // ns
|
||||
|
||||
Reference in New Issue
Block a user