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

refs #409 adapt samples to use CAircraftMatcher

Browse Source
This commit is contained in:
Roland Winklmeier
2015-05-08 15:14:34 +02:00
parent 4147829488
commit 5ccd49722a
2 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
samples/blackmiscsim/samplesfscommon.cpp
View File

@@ -10,7 +10,8 @@
#include "samplesfscommon.h"
#include "blackmisc/sampleutils.h"
#include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h"
#include "blackmisc/simulation/fscommon/aircraftmapper.h"
#include "blackmisc/simulation/fscommon/aircraftmatcher.h"
#include "blackmisc/simulation/fscommon/aircraftcfgparser.h"
#include <QDebug>
#include <QFuture>
@@ -29,13 +30,11 @@ namespace BlackSimTest
*/
int CSamplesFsCommon::samples(QTextStream &streamOut, QTextStream &streamIn)
{
QString fsxDir = CSampleUtils::selectDirectory({"P:/FlightSimulatorX (MSI)/SimObjects", "P:/Temp/SimObjects"}, streamOut, streamIn);
CAircraftMapper mapper;
if (!mapper.changeCAircraftCfgEntriesDirectory(fsxDir))
{
streamOut << "Wrong or empty directoy " << fsxDir << endl;
return 0;
}
QString fsxDir = CSampleUtils::selectDirectory({"C:/Program Files (x86)/Microsoft Games/Microsoft Flight Simulator X/SimObjects",
"C:/Flight Simulator 9/Aircraft"}, streamOut, streamIn);
CAircraftCfgParser parser;
parser.changeRootDirectory(fsxDir);
streamOut << "start reading, press RETURN" << endl;
QString input = streamIn.readLine();
@@ -44,11 +43,11 @@ namespace BlackSimTest
streamOut << "reading directly" << endl;
QTime time;
time.start();
streamOut << "reading " << mapper.getAircraftCfgEntriesList().getRootDirectory() << endl;
mapper.readSimObjects();
streamOut << "read entries: " << mapper.getAircraftCfgEntriesList().size() << " in " << time.restart() << "ms" << endl;
streamOut << "reading " << parser.getRootDirectory() << endl;
parser.parse();
streamOut << "read entries: " << parser.getAircraftCfgEntriesList().size() << " in " << time.restart() << "ms" << endl;
CAircraftCfgEntriesList entriesList = mapper.getAircraftCfgEntriesList();
CAircraftCfgEntriesList entriesList = parser.getAircraftCfgEntriesList();
QJsonDocument doc(entriesList.toJson());
QByteArray jsonArray(doc.toJson());
streamOut << "write JSON array with size " << jsonArray.size() << endl;

31
samples/blackmiscsim/samplesmodelmapping.cpp
View File

@@ -10,8 +10,9 @@
#include "samplesmodelmapping.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackmisc/sampleutils.h"
#include "blackmisc/simulation/fscommon/vpilotmodelmappings.h"
#include "blackmisc/simulation/fscommon/aircraftmapper.h"
#include "blackmisc/simulation/fscommon/aircraftcfgparser.h"
#include "blackmisc/simulation/fscommon/modelmappingsprovidervpilot.h"
#include "blackmisc/simulation/fscommon/aircraftmatcher.h"
#include <QDebug>
#include <memory>
@@ -32,37 +33,39 @@ namespace BlackSimTest
{
BlackMisc::registerMetadata();
std::unique_ptr<ISimulatorModelMappings> cvm(new CVPilotModelMappings(true));
std::unique_ptr<IModelMappingsProvider> cvm(new CModelMappingsProviderVPilot(true));
bool s = cvm->read();
streamOut << "directory: " << CVPilotModelMappings::standardMappingsDirectory() << endl;
streamOut << "loaded: " << BlackMisc::boolToYesNo(s) << " size: " << cvm->size() << endl;
streamOut << "directory: " << CModelMappingsProviderVPilot::standardMappingsDirectory() << endl;
streamOut << "loaded: " << BlackMisc::boolToYesNo(s) << " size: " << cvm->getMappingList().size() << endl;
// mapper with rule set, handing over ownership
CAircraftMapper mapper(std::move(cvm));
CAircraftCfgParser cfgParser;
QString fsxDir = CSampleUtils::selectDirectory({QStringLiteral("P:/FlightSimulatorX (MSI)/SimObjects"),
QStringLiteral("P:/Temp/SimObjects"),
QStringLiteral("C:/Flight Simulator 9/Aircraft")}, streamOut, streamIn);
if (!mapper.changeCAircraftCfgEntriesDirectory(fsxDir))
if (!cfgParser.changeRootDirectory(fsxDir))
{
streamOut << "Wrong or empty directoy " << fsxDir << endl;
return 0;
}
streamOut << "Start reading models" << endl;
mapper.changeCAircraftCfgEntriesDirectory(fsxDir);
mapper.readSimObjects();
streamOut << "Read models: " << mapper.countAircraftCfgEntries() << endl;
streamOut << "Ambigious models: " << mapper.getAircraftCfgEntriesList().detectAmbiguousTitles().join(", ") << endl;
cfgParser.parse(CAircraftCfgParser::ModeBlocking);
streamOut << "Read models: " << cfgParser.getAircraftCfgEntriesList().size() << endl;
streamOut << "Ambigious models: " << cfgParser.getAircraftCfgEntriesList().detectAmbiguousTitles().join(", ") << endl;
// sync definitions, remove redundant ones
streamOut << "Now synchronizing defintions: " << mapper.countMappingRules() << endl;
int afterSync = mapper.synchronize();
CAircraftMatcher matcher(CAircraftMatcher::AllModes);
matcher.setModelMappingProvider(std::move(cvm));
matcher.setInstalledModels(cfgParser.getAircraftCfgEntriesList().toAircraftModelList());
streamOut << "Now synchronizing defintions: " << matcher.getAircraftMappingList().size() << endl;
int afterSync = matcher.synchronize();
streamOut << "After synchronizing definitions: " << afterSync << endl;
CAircraftIcaoData icao("C172");
streamOut << "Searching for " << icao << endl;
streamOut << mapper.getAircraftMappingList().findByIcaoCodeExact(icao) << endl;
streamOut << matcher.getAircraftMappingList().findByIcaoCodeExact(icao) << endl;
return 0;
}