flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-23 15:25:35 +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;