refs #637, move matcher to blackcore

(access to sApp/web services)
This commit is contained in:
Klaus Basan
2016-04-09 10:34:12 +02:00
parent f4f195a5f4
commit 1953665c40
12 changed files with 504 additions and 494 deletions

View File

@@ -7,12 +7,13 @@
* contained in the LICENSE file.
*/
#include "blackmisc/registermetadata.h"
#include "blackcore/application.h"
#include "samplesfscommon.h"
#include "samplesfsx.h"
#include "samplesmodelmapping.h"
#include "samplesvpilotrules.h"
#include <QCoreApplication>
#include <QTextStream>
#include <QDebug>
#include <QTime>
@@ -23,12 +24,14 @@
//! main
int main(int argc, char *argv[])
{
Q_UNUSED(argc);
Q_UNUSED(argv);
QCoreApplication qa(argc, argv);
BlackCore::CApplication a;
Q_UNUSED(a);
Q_UNUSED(qa);
QTextStream streamIn(stdin);
QTextStream streamOut(stdout);
BlackMisc::registerMetadata();
streamOut << "Run samples:" << endl;
streamOut << "1 .. FS common / Simulation (with cfg files reading)" << endl;

View File

@@ -7,10 +7,11 @@ TEMPLATE = app
CONFIG += console
CONFIG -= app_bundle
CONFIG += blackmisc blacksim
CONFIG += blackmisc blacksim blackcore
CONFIG -= app_bundle
DEPENDPATH += . ../../src/blackmisc
DEPENDPATH += . ../../src/blackcore
INCLUDEPATH += . ../../src
DESTDIR = $$DestRoot/bin

View File

@@ -14,7 +14,6 @@
#include "blackmisc/sampleutils.h"
#include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h"
#include "blackmisc/simulation/fscommon/aircraftcfgparser.h"
#include "blackmisc/simulation/aircraftmatcher.h"
#include "blackmisc/simulation/simulatorinfo.h"

View File

@@ -11,17 +11,18 @@
//! \ingroup sampleblackmiscsim
#include "samplesmodelmapping.h"
#include "blackcore/aircraftmatcher.h"
#include "blackmisc/registermetadata.h"
#include "blackmisc/stringutils.h"
#include "blackmisc/sampleutils.h"
#include "blackmisc/simulation/fscommon/aircraftcfgparser.h"
#include "blackmisc/simulation/fscommon/vpilotrulesreader.h"
#include "blackmisc/simulation/aircraftmatcher.h"
#include <QDebug>
#include <memory>
#include <utility>
using namespace BlackCore;
using namespace BlackMisc;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::Simulation::FsCommon;
@@ -31,7 +32,6 @@ namespace BlackSample
{
void CSamplesModelMapping::samples(QTextStream &streamOut, QTextStream &streamIn)
{
BlackMisc::registerMetadata();
CVPilotRulesReader vpRulesReader;
bool s = vpRulesReader.read(true);
streamOut << "directory: " << CVPilotRulesReader::standardMappingsDirectory() << endl;