flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-01 05:26:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T658, adjusted usage of matching script in matcher component (for testing)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

58
src/blackgui/components/modelmatchercomponent.cpp
View File

@@ -73,14 +73,17 @@ namespace BlackGui
ui->le_Callsign->setValidator(validator);
connect(ui->comp_SimulatorSelector, &CSimulatorSelector::changed, this, &CModelMatcherComponent::onSimulatorChanged);
connect(sGui->getWebDataServices(), &CWebDataServices::dataRead, this, &CModelMatcherComponent::onWebDataRead, Qt::QueuedConnection);
connect(sGui->getWebDataServices(), &CWebDataServices::dataRead, this, &CModelMatcherComponent::onWebDataRead, Qt::QueuedConnection);
connect(ui->pb_ModelMatching, &QPushButton::pressed, this, &CModelMatcherComponent::testModelMatching);
connect(ui->pb_ReverseLookup, &QPushButton::pressed, this, &CModelMatcherComponent::reverseLookup);
connect(ui->pb_Settings, &QPushButton::pressed, this, &CModelMatcherComponent::displaySettingsDialog);
connect(ui->pb_Settings, &QPushButton::pressed, this, &CModelMatcherComponent::displaySettingsDialog);
connect(ui->cb_UseWorkbench, &QCheckBox::toggled, this, &CModelMatcherComponent::onWorkbenchToggled);
// initial settings
m_matcher.setSetup(m_matchingSettings.get());
this->redisplay();
ui->cb_UseWorkbench->setVisible(false);
}
@@ -153,18 +156,22 @@ namespace BlackGui
void CModelMatcherComponent::testModelMatching()
{
ui->te_Results->clear();
CStatusMessageList msgs;
this->onSimulatorChanged(ui->comp_SimulatorSelector->getValue()); // update model set to latest version
CSimulatedAircraft remoteAircraft(createAircraft());
CStatusMessageList msgs;
CSimulatedAircraft remoteAircraft(this->createAircraft());
m_matcher.setDefaultModel(CModelMatcherComponent::defaultModel());
if (ui->cb_withReverseLookup->isChecked())
{
const QString liveryString(ui->comp_LiverySelector->getRawCombinedCode());
const CAircraftModel reverseModel = CAircraftMatcher::reverseLookupModel(remoteAircraft.getModel(), liveryString, &msgs);
const CAircraftModel reverseModel = CAircraftMatcher::reverseLookupModel(remoteAircraft.getModel(), liveryString, m_matcher.getSetup(), &msgs);
remoteAircraft.setModel(reverseModel); // current model
}
m_matcher.setDefaultModel(CModelMatcherComponent::defaultModel());
const CAircraftModel matched = m_matcher.getClosestMatch(remoteAircraft, MatchingLogAll, &msgs); // test model matching
CStatusMessageList matchingMsgs;
const CAircraftModel matched = m_matcher.getClosestMatch(remoteAircraft, MatchingLogAll, &matchingMsgs, true); // test model matching
msgs.push_back(matchingMsgs);
ui->te_Results->setText(matched.toQString(true));
ui->tvp_ResultMessages->updateContainer(msgs);
ui->tvp_ResultMessages->fullResizeToContents();
@@ -180,19 +187,7 @@ namespace BlackGui
const CAircraftMatcherSetup setup = m_matcher.getSetup();
const CSimulatedAircraft remoteAircraft(createAircraft());
const QString livery(ui->comp_LiverySelector->getRawCombinedCode());
const CAircraftModel matched = CAircraftMatcher::reverseLookupModel(remoteAircraft.getModel(), livery, &msgs);
// Script
CAircraftModel matchedWithScript = matched;
if (setup.doRunMsNetworkEntryScript())
{
matchedWithScript = CAircraftMatcher::networkEntryScript(matched, setup, &msgs);
}
else
{
CMatchingUtils::addLogDetailsToList(&msgs, remoteAircraft.getCallsign(), QStringLiteral("No entry script used"));
}
const CAircraftModel matched = CAircraftMatcher::reverseLookupModel(remoteAircraft.getModel(), livery, setup, &msgs);
ui->te_Results->setText(matched.toQString(true));
ui->tvp_ResultMessages->updateContainer(msgs);
}
@@ -276,5 +271,28 @@ namespace BlackGui
if (model.getCallsign().isEmpty()) { model.setCallsign("SWIFT"); }
return model;
}
MSReturnValues CModelMatcherComponent::matchingScript(const CAircraftModel &inModel, const CAircraftMatcherSetup &setup, CStatusMessageList &msgs)
{
// Script
if (setup.doRunMsReverseLookupScript())
{
const MSReturnValues rv = CAircraftMatcher::reverseLookupScript(inModel, setup, &msgs);
if (rv.runScriptAndModified())
{
return rv;
}
else
{
CMatchingUtils::addLogDetailsToList(&msgs, inModel.getCallsign(), QStringLiteral("Matching script, no modification"));
}
}
else
{
CMatchingUtils::addLogDetailsToList(&msgs, inModel.getCallsign(), QStringLiteral("No reverse lookup script used"));
}
return inModel;
}
} // ns
} // ns