mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-03-22 23:05:36 +08:00
refs #452 updated tests/samples to reflect previous changes
This commit is contained in:
committed by
Mathew Sutcliffe
parent
c80f352710
commit
3e1e1070c1
@@ -36,13 +36,14 @@ namespace BlackSimTest
|
||||
std::unique_ptr<IModelMappingsProvider> cvm(new CModelMappingsProviderVPilot(true));
|
||||
bool s = cvm->read();
|
||||
streamOut << "directory: " << CVPilotRulesReader::standardMappingsDirectory() << endl;
|
||||
streamOut << "loaded: " << BlackMisc::boolToYesNo(s) << " size: " << cvm->getMappingList().size() << endl;
|
||||
streamOut << "loaded: " << BlackMisc::boolToYesNo(s) << " size: " << cvm->getDatastoreModels().size() << endl;
|
||||
|
||||
// mapper with rule set, handing over ownership
|
||||
CAircraftCfgParser cfgParser;
|
||||
QString fsxDir = CSampleUtils::selectDirectory({QStringLiteral("P:/FlightSimulatorX (MSI)/SimObjects"),
|
||||
QStringLiteral("P:/Temp/SimObjects"),
|
||||
QStringLiteral("C:/Flight Simulator 9/Aircraft")}, streamOut, streamIn);
|
||||
QStringLiteral("P:/Temp/SimObjects"),
|
||||
QStringLiteral("C:/Flight Simulator 9/Aircraft")
|
||||
}, streamOut, streamIn);
|
||||
|
||||
if (!cfgParser.changeRootDirectory(fsxDir))
|
||||
{
|
||||
@@ -51,7 +52,7 @@ namespace BlackSimTest
|
||||
}
|
||||
|
||||
streamOut << "Start reading models" << endl;
|
||||
cfgParser.parse(CAircraftCfgParser::ModeBlocking);
|
||||
cfgParser.startLoading(CAircraftCfgParser::ModeBlocking);
|
||||
streamOut << "Read models: " << cfgParser.getAircraftCfgEntriesList().size() << endl;
|
||||
streamOut << "Ambigious models: " << cfgParser.getAircraftCfgEntriesList().detectAmbiguousTitles().join(", ") << endl;
|
||||
|
||||
@@ -59,13 +60,13 @@ namespace BlackSimTest
|
||||
CAircraftMatcher matcher(CAircraftMatcher::AllModes);
|
||||
matcher.setModelMappingProvider(std::move(cvm));
|
||||
matcher.setInstalledModels(cfgParser.getAircraftCfgEntriesList().toAircraftModelList());
|
||||
streamOut << "Now synchronizing defintions: " << matcher.getAircraftMappingList().size() << endl;
|
||||
streamOut << "Now synchronizing defintions: " << matcher.getDatastoreModels().size() << endl;
|
||||
int afterSync = matcher.synchronize();
|
||||
streamOut << "After synchronizing definitions: " << afterSync << endl;
|
||||
|
||||
CAircraftIcaoData icao("C172");
|
||||
CAircraftIcaoCode icao("C172");
|
||||
streamOut << "Searching for " << icao << endl;
|
||||
streamOut << matcher.getAircraftMappingList().findByIcaoCodeExact(icao) << endl;
|
||||
streamOut << matcher.getDatastoreModels().findByIcaoDesignators(icao, CAirlineIcaoCode()) << endl;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
Reference in New Issue
Block a user