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:
Klaus Basan
2019-06-05 00:22:54 +02:00
committed by Mat Sutcliffe
parent a58204ad9e
commit 502e9e10d2
2 changed files with 47 additions and 24 deletions

View File

@@ -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