Ref T268, proxy style

This commit is contained in:
Klaus Basan
2018-07-06 21:25:59 +02:00
parent 98106be4ad
commit f8c64c0296

View File

@@ -119,11 +119,11 @@ namespace BlackSimPlugin
QDBusPendingReply<QStringList, QList<double>, QList<double>, QList<double>, QList<double>> reply = *watcher; QDBusPendingReply<QStringList, QList<double>, QList<double>, QList<double>, QList<double>> reply = *watcher;
if (!reply.isError()) if (!reply.isError())
{ {
QStringList callsigns = reply.argumentAt<0>(); const QStringList callsigns = reply.argumentAt<0>();
QList<double> latitudesDeg = reply.argumentAt<1>(); const QList<double> latitudesDeg = reply.argumentAt<1>();
QList<double> longitudesDeg = reply.argumentAt<2>(); const QList<double> longitudesDeg = reply.argumentAt<2>();
QList<double> elevationsM = reply.argumentAt<3>(); const QList<double> elevationsM = reply.argumentAt<3>();
QList<double> verticalOffsets = reply.argumentAt<4>(); const QList<double> verticalOffsets = reply.argumentAt<4>();
setter(callsigns, latitudesDeg, longitudesDeg, elevationsM, verticalOffsets); setter(callsigns, latitudesDeg, longitudesDeg, elevationsM, verticalOffsets);
} }
watcher->deleteLater(); watcher->deleteLater();
@@ -139,14 +139,12 @@ namespace BlackSimPlugin
QDBusPendingReply<QString, double> reply = *watcher; QDBusPendingReply<QString, double> reply = *watcher;
if (!reply.isError()) if (!reply.isError())
{ {
CCallsign cs(reply.argumentAt<0>()); const CCallsign cs(reply.argumentAt<0>());
double elevationMeters = reply.argumentAt<1>(); const double elevationMeters = reply.argumentAt<1>();
CAltitude elevationAlt(elevationMeters, CLengthUnit::m()); const CAltitude elevationAlt(elevationMeters, CLengthUnit::m(), CLengthUnit::ft());
elevationAlt.switchUnit(CLengthUnit::ft()); const CElevationPlane elevation(CLatitude(latitude, CAngleUnit::deg()),
CElevationPlane elevation(CLatitude(latitude, CAngleUnit::deg()), CLongitude(longitude, CAngleUnit::deg()),
CLongitude(longitude, CAngleUnit::deg()), elevationAlt, CElevationPlane::singlePointRadius());
elevationAlt);
elevation.setSinglePointRadius();
setter(elevation, cs); setter(elevation, cs);
} }
watcher->deleteLater(); watcher->deleteLater();