flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 04:25:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

T658, matching script for network entry

Browse Source
This commit is contained in:
Klaus Basan
2019-05-24 14:47:10 +02:00
committed by Mat Sutcliffe
parent fd281a464c
commit cec768b9a4
5 changed files with 150 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/blackcore/aircraftmatcher.cpp
View File

@@ -311,20 +311,10 @@ namespace BlackCore
static const QString logFile = CFileUtils::appendFilePaths(CDirectoryUtils::logDirectory(), "logMatchingSriptEntry.log");
QJSEngine engine;
// engine.installExtensions(QJSEngine::ConsoleExtension);
QJSValue jsMetaObject = engine.newQMetaObject(&MSSwiftValues::staticMetaObject);
static const QJSValue jsMetaObject = engine.newQMetaObject(&MSSwiftValues::staticMetaObject);
engine.globalObject().setProperty("SwiftValues", jsMetaObject);
MSSwiftValues networkObject(
callsign.asString(),
inAircraftIcao.getDesignator(), inAircraftIcao.getDbKey(),
inAirlineIcao.getDesignator(), inAirlineIcao.getDbKey(),
inLivery.getCombinedCode(), inLivery.getDbKey()
);
MSSwiftValues reverseModel(
inModel.getCallsign().asString(),
inModel.getAircraftIcaoCode().getDesignator(), inModel.getAircraftIcaoCode().getDbKey(),
inModel.getAirlineIcaoCode().getDesignator(), inModel.getAirlineIcaoCode().getDbKey(),
inModel.getLivery().getCombinedCode(), inModel.getLivery().getDbKey()
);
MSSwiftValues networkObject(callsign.asString(), inAircraftIcao, inLivery);
MSSwiftValues reverseModel(callsign.asString(), inAircraftIcao, inLivery);
MSSwiftValues returnObject;
QJSValue jsNetworkObject = engine.newQObject(&networkObject);
@@ -334,6 +324,7 @@ namespace BlackCore
QJSValue jsReturnObject = engine.newQObject(&returnObject);
engine.globalObject().setProperty("returnObject", jsNetworkObject);
QString logMessage;
QJSValue ms = engine.evaluate(js, logFile);
ms = ms.call();
if (ms.isError())
@@ -344,22 +335,33 @@ namespace BlackCore
}
else
{
QString logMessage;
if (ms.isQObject())
{
// reverseModel = ms.toQ
const MSSwiftValues *reverseModelProcessed = qobject_cast<const MSSwiftValues *>(ms.toQObject());
logMessage = reverseModelProcessed->getLogMessage();
if (!reverseModelProcessed->isModified()) { break; }
// changed
if (reverseModel.hasChangedAircraftIcao(inAircraftIcao))
{
CAircraftIcaoCode icao;
if (log) { CMatchingUtils::addLogDetailsToList(log, callsign, QStringLiteral("Matching script: '%1' -> '%2'").arg(inAircraftIcao.getDesignatorDbKey(), icao.getDesignatorDbKey())); }
}
if (reverseModel.hasChangedAirlineIcao(inAirlineIcao))
{
}
}
else if (ms.isString())
{
logMessage = ms.toString();
}
if (!logMessage.isEmpty())
{
CLogMessage(getLogCategories()).info(u"Matching script: '%1'") << logMessage;
}
}
// log message
if (log && !logMessage.isEmpty()) { CMatchingUtils::addLogDetailsToList(log, callsign, QStringLiteral("Matching script: '%1'").arg(logMessage)); }
// end this
break;
}