flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-10 05:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T557 Metaclass flag to preserve measurement unit when marshalling PQ's in flight plans.

Browse Source
This commit is contained in:
Mat Sutcliffe
2019-03-04 01:14:09 +00:00
parent 567a55503f
commit 83dec5408b
10 changed files with 114 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/blackmisc/test/testserviceinterface.h
View File

@@ -20,6 +20,7 @@
#include "blackmisc/aviation/atcstationlist.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/aviation/comsystem.h"
#include "blackmisc/aviation/flightplan.h"
#include "blackmisc/aviation/track.h"
#include "blackmisc/aviation/transponder.h"
#include "blackmisc/geo/coordinategeodetic.h"
@@ -264,6 +265,13 @@ namespace BlackMisc
return asyncCallWithArgumentList(QLatin1String("pingIndexVariantMap"), argumentList);
}
QDBusPendingReply<BlackMisc::Aviation::CFlightPlan> pingFlightPlan(const Aviation::CFlightPlan &flightPlan)
{
QList<QVariant> argumentList;
argumentList << QVariant::fromValue(flightPlan);
return asyncCallWithArgumentList(QLatin1String("pingFlightPlan"), argumentList);
}
QDBusPendingReply<BlackMisc::Aviation::CAltitude> receiveAltitude(const BlackMisc::Aviation::CAltitude &altitude)
{
QList<QVariant> argumentList;
@@ -382,13 +390,31 @@ namespace BlackMisc
template<class ValueObject>
static bool pingCompare(const ValueObject &in, const ValueObject &out, QTextStream &ts, bool verbose, int &errors)
{
const bool equal = (in == out);
if (!equal) { errors++; }
if (equal && !verbose) { return true; }
ts << "I: " << in.toQString() << endl << "O: " << out.toQString() << endl;
const bool equal = (in == out && extraCompare(in, out));
if (!equal)
{
errors++;
if (verbose) { ts << "I: " << in.toQString() << endl << "O: " << out.toQString() << endl; }
}
return equal;
}
//! Extra comparison step for some types
//! @{
template<class ValueObject>
static bool extraCompare(const ValueObject &, const ValueObject &) { return true; }
static bool extraCompare(const BlackMisc::Aviation::CFlightPlan &in, const BlackMisc::Aviation::CFlightPlan &out)
{
// flight plan: check units are preserved
if (in.getEnrouteTime().getUnit() != out.getEnrouteTime().getUnit()) { return false; }
if (in.getFuelTime().getUnit() != out.getFuelTime().getUnit()) { return false; }
if (in.getCruiseAltitude().getUnit() != out.getCruiseAltitude().getUnit()) { return false; }
if (in.getCruiseTrueAirspeed().getUnit() != out.getCruiseTrueAirspeed().getUnit()) { return false; }
return true;
}
//! @}
//! Error info string
static const QString &errorInfo(bool ok);
};