mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-06 10:15:38 +08:00
refactor: clang format line length
This commit is contained in:
Lars Toenning
@@ -24,25 +24,21 @@ using namespace swift::misc::simulation;
|
||||
//! \cond
|
||||
namespace swift::misc::test
|
||||
{
|
||||
int randomIndex(int size)
|
||||
{
|
||||
return CMathUtils::randomInteger(0, size - 1);
|
||||
}
|
||||
int randomIndex(int size) { return CMathUtils::randomInteger(0, size - 1); }
|
||||
|
||||
const CServer &CTestData::getTrafficServer()
|
||||
{
|
||||
static const CServer trafficServer("fooserver", "a foo server", "localhost", 1234,
|
||||
CUser("112233", "Some real name", "email@xyz.com", "secret"),
|
||||
CFsdSetup(), CEcosystem(CEcosystem::VATSIM), CServer::FSDServerVatsim);
|
||||
CUser("112233", "Some real name", "email@xyz.com", "secret"), CFsdSetup(),
|
||||
CEcosystem(CEcosystem::VATSIM), CServer::FSDServerVatsim);
|
||||
return trafficServer;
|
||||
}
|
||||
|
||||
const CVariantList &CTestData::getCVariantList()
|
||||
{
|
||||
static const CVariantList vl(
|
||||
{ CVariant::from(CLength(100, CLengthUnit::m())),
|
||||
CVariant::from(CSpeed(200, CSpeedUnit::m_s())),
|
||||
CVariant::from(CTestData::getCoordinateMunichTower()) });
|
||||
static const CVariantList vl({ CVariant::from(CLength(100, CLengthUnit::m())),
|
||||
CVariant::from(CSpeed(200, CSpeedUnit::m_s())),
|
||||
CVariant::from(CTestData::getCoordinateMunichTower()) });
|
||||
return vl;
|
||||
}
|
||||
|
||||
@@ -65,59 +61,57 @@ namespace swift::misc::test
|
||||
|
||||
const CCoordinateGeodetic &CTestData::getCoordinateMunichTower()
|
||||
{
|
||||
static const CCoordinateGeodetic c = CCoordinateGeodetic::fromWgs84("48° 21′ 13″ N", "11° 47′ 09″ E", { 1487, CLengthUnit::ft() });
|
||||
static const CCoordinateGeodetic c =
|
||||
CCoordinateGeodetic::fromWgs84("48° 21′ 13″ N", "11° 47′ 09″ E", { 1487, CLengthUnit::ft() });
|
||||
return c;
|
||||
}
|
||||
|
||||
const CCoordinateGeodetic &CTestData::getCoordinateFrankfurtTower()
|
||||
{
|
||||
static const CCoordinateGeodetic c = CCoordinateGeodetic::fromWgs84("50° 1' 18.38″ N", "8° 33' 23.24″ E", { 355, CLengthUnit::ft() });
|
||||
static const CCoordinateGeodetic c =
|
||||
CCoordinateGeodetic::fromWgs84("50° 1' 18.38″ N", "8° 33' 23.24″ E", { 355, CLengthUnit::ft() });
|
||||
return c;
|
||||
}
|
||||
|
||||
const CFlightPlan &CTestData::getFlightPlan()
|
||||
{
|
||||
static const CFlightPlanAircraftInfo info("T/A320/F");
|
||||
static const CFlightPlan fp(CCallsign("DAMBZ", CCallsign::Aircraft),
|
||||
info, "EDDF", "EDDM", "EDDN",
|
||||
QDateTime::currentDateTimeUtc(), QDateTime::currentDateTime().addSecs(600),
|
||||
CTime(1.0, CTimeUnit::h()), CTime(2.0, CTimeUnit::h()),
|
||||
CAltitude(10000, CAltitude::MeanSeaLevel, CLengthUnit::ft()), CSpeed(400, CSpeedUnit::kts()), CFlightPlan::IFR,
|
||||
"DKB T104 ANORA", "Testing flight");
|
||||
static const CFlightPlan fp(
|
||||
CCallsign("DAMBZ", CCallsign::Aircraft), info, "EDDF", "EDDM", "EDDN", QDateTime::currentDateTimeUtc(),
|
||||
QDateTime::currentDateTime().addSecs(600), CTime(1.0, CTimeUnit::h()), CTime(2.0, CTimeUnit::h()),
|
||||
CAltitude(10000, CAltitude::MeanSeaLevel, CLengthUnit::ft()), CSpeed(400, CSpeedUnit::kts()),
|
||||
CFlightPlan::IFR, "DKB T104 ANORA", "Testing flight");
|
||||
return fp;
|
||||
}
|
||||
|
||||
const CAtcStation &CTestData::getMunichTower()
|
||||
{
|
||||
static const CAtcStation t(CCallsign("EDDM_TWR"), CUser("654321", "John Doe"),
|
||||
CFrequency(119.9, CFrequencyUnit::MHz()), CTestData::getCoordinateFrankfurtTower(), CLength(50, CLengthUnit::km()),
|
||||
false);
|
||||
CFrequency(119.9, CFrequencyUnit::MHz()), CTestData::getCoordinateFrankfurtTower(),
|
||||
CLength(50, CLengthUnit::km()), false);
|
||||
return t;
|
||||
}
|
||||
|
||||
const CAtcStation &CTestData::getFrankfurtTower()
|
||||
{
|
||||
static const CAtcStation t(CCallsign("EDDF_TWR"), CUser("654321", "Joe Bar"),
|
||||
CFrequency(118.7, CFrequencyUnit::MHz()), CTestData::getCoordinateMunichTower(), CLength(50, CLengthUnit::km()),
|
||||
true, QDateTime::currentDateTimeUtc().addSecs(2400));
|
||||
CFrequency(118.7, CFrequencyUnit::MHz()), CTestData::getCoordinateMunichTower(),
|
||||
CLength(50, CLengthUnit::km()), true, QDateTime::currentDateTimeUtc().addSecs(2400));
|
||||
return t;
|
||||
}
|
||||
|
||||
const CAtcStation &CTestData::getMunichApproach()
|
||||
{
|
||||
static const CAtcStation t(CCallsign("eddm_app"), CUser("654321", "Jen Doe"),
|
||||
CFrequency(120.7, CFrequencyUnit::MHz()),
|
||||
CTestData::getCoordinateMunichTower(), CLength(100, CLengthUnit::km()),
|
||||
false);
|
||||
CFrequency(120.7, CFrequencyUnit::MHz()), CTestData::getCoordinateMunichTower(),
|
||||
CLength(100, CLengthUnit::km()), false);
|
||||
return t;
|
||||
}
|
||||
|
||||
const CAtcStationList &CTestData::getAtcStations()
|
||||
{
|
||||
static const CAtcStationList stations(
|
||||
{ CTestData::getFrankfurtTower(),
|
||||
CTestData::getMunichTower(),
|
||||
CTestData::getMunichApproach() });
|
||||
{ CTestData::getFrankfurtTower(), CTestData::getMunichTower(), CTestData::getMunichApproach() });
|
||||
return stations;
|
||||
}
|
||||
|
||||
@@ -129,9 +123,8 @@ namespace swift::misc::test
|
||||
|
||||
const CCallsignSet &CTestData::getPilotCallsigns()
|
||||
{
|
||||
static const CCallsignSet callsigns(
|
||||
{ CCallsign("DEMBZ"), CCallsign("DLH123"), CCallsign("RYR635L"),
|
||||
CCallsign("LGL974"), CCallsign("AUI129"), CCallsign("CLX756") });
|
||||
static const CCallsignSet callsigns({ CCallsign("DEMBZ"), CCallsign("DLH123"), CCallsign("RYR635L"),
|
||||
CCallsign("LGL974"), CCallsign("AUI129"), CCallsign("CLX756") });
|
||||
return callsigns;
|
||||
}
|
||||
|
||||
@@ -143,9 +136,8 @@ namespace swift::misc::test
|
||||
|
||||
const CCallsignSet &CTestData::getControllerCallsigns()
|
||||
{
|
||||
static const CCallsignSet callsigns(
|
||||
{ CCallsign("EDDM_TWR"), CCallsign("EDDM_APP"), CCallsign("EDDM_GND"),
|
||||
CCallsign("EDDF_TWR"), CCallsign("EDDF_APP"), CCallsign("EDDF_GND") });
|
||||
static const CCallsignSet callsigns({ CCallsign("EDDM_TWR"), CCallsign("EDDM_APP"), CCallsign("EDDM_GND"),
|
||||
CCallsign("EDDF_TWR"), CCallsign("EDDF_APP"), CCallsign("EDDF_GND") });
|
||||
return callsigns;
|
||||
}
|
||||
|
||||
@@ -158,15 +150,14 @@ namespace swift::misc::test
|
||||
const CUserList &CTestData::getPilots()
|
||||
{
|
||||
static const QList<CCallsign> callsigns(CTestData::getPilotCallsigns().toQList());
|
||||
static const CUserList pilots(
|
||||
{
|
||||
CUser("100100", "Joe Doe", callsigns[0]),
|
||||
CUser("100101", "Jane Foo", callsigns[1]),
|
||||
CUser("100200", "Frank Sky", callsigns[2]),
|
||||
CUser("100300", "Richard F. Frings", callsigns[3]),
|
||||
CUser("100301", "Torben Frey", callsigns[4]),
|
||||
CUser("100400", "Kay Dòresn", callsigns[5]),
|
||||
});
|
||||
static const CUserList pilots({
|
||||
CUser("100100", "Joe Doe", callsigns[0]),
|
||||
CUser("100101", "Jane Foo", callsigns[1]),
|
||||
CUser("100200", "Frank Sky", callsigns[2]),
|
||||
CUser("100300", "Richard F. Frings", callsigns[3]),
|
||||
CUser("100301", "Torben Frey", callsigns[4]),
|
||||
CUser("100400", "Kay Dòresn", callsigns[5]),
|
||||
});
|
||||
return pilots;
|
||||
}
|
||||
|
||||
@@ -179,15 +170,14 @@ namespace swift::misc::test
|
||||
const CUserList &CTestData::getControllers()
|
||||
{
|
||||
static const QList<CCallsign> callsigns(CTestData::getControllerCallsigns().toQList());
|
||||
static const CUserList controllers(
|
||||
{
|
||||
CUser("300100", "Jeff Doe", callsigns[0]),
|
||||
CUser("300101", "Foo Mister", callsigns[1]),
|
||||
CUser("300200", "Sky Du", callsigns[2]),
|
||||
CUser("300300", "F. Frings", callsigns[3]),
|
||||
CUser("300301", "Ralf Smith", callsigns[4]),
|
||||
CUser("300400", "Doreen Jump", callsigns[5]),
|
||||
});
|
||||
static const CUserList controllers({
|
||||
CUser("300100", "Jeff Doe", callsigns[0]),
|
||||
CUser("300101", "Foo Mister", callsigns[1]),
|
||||
CUser("300200", "Sky Du", callsigns[2]),
|
||||
CUser("300300", "F. Frings", callsigns[3]),
|
||||
CUser("300301", "Ralf Smith", callsigns[4]),
|
||||
CUser("300400", "Doreen Jump", callsigns[5]),
|
||||
});
|
||||
return controllers;
|
||||
}
|
||||
|
||||
@@ -199,9 +189,9 @@ namespace swift::misc::test
|
||||
|
||||
CAircraftSituation getAircraftSituationAboveMunichTowerImpl()
|
||||
{
|
||||
CAircraftSituation situation(CTestData::getCoordinateMunichTower(), CHeading(10, CHeading::True, CAngleUnit::deg()),
|
||||
CAngle(12, CAngleUnit::deg()), CAngle(5, CAngleUnit::deg()),
|
||||
CSpeed(111, CSpeedUnit::km_h()));
|
||||
CAircraftSituation situation(CTestData::getCoordinateMunichTower(),
|
||||
CHeading(10, CHeading::True, CAngleUnit::deg()), CAngle(12, CAngleUnit::deg()),
|
||||
CAngle(5, CAngleUnit::deg()), CSpeed(111, CSpeedUnit::km_h()));
|
||||
situation.setAltitude({ 2500, CLengthUnit::ft() });
|
||||
situation.setCallsign(CTestData::getRandomPilotCallsign());
|
||||
return situation;
|
||||
@@ -215,9 +205,9 @@ namespace swift::misc::test
|
||||
|
||||
CAircraftSituation getAircraftSituationAboveFrankfurtTowerImpl()
|
||||
{
|
||||
CAircraftSituation situation(CTestData::getCoordinateFrankfurtTower(), CHeading(290, CHeading::True, CAngleUnit::deg()),
|
||||
CAngle(4, CAngleUnit::deg()), CAngle(10, CAngleUnit::deg()),
|
||||
CSpeed(200, CSpeedUnit::km_h()));
|
||||
CAircraftSituation situation(CTestData::getCoordinateFrankfurtTower(),
|
||||
CHeading(290, CHeading::True, CAngleUnit::deg()), CAngle(4, CAngleUnit::deg()),
|
||||
CAngle(10, CAngleUnit::deg()), CSpeed(200, CSpeedUnit::km_h()));
|
||||
situation.setAltitude({ 4000, CLengthUnit::ft() });
|
||||
situation.setCallsign(CTestData::getRandomPilotCallsign());
|
||||
return situation;
|
||||
@@ -231,7 +221,8 @@ namespace swift::misc::test
|
||||
|
||||
const CAircraftIcaoCode &CTestData::getDBAircraftIcaoB737()
|
||||
{
|
||||
static const QString json = CFileUtils::readFileToString(CSwiftDirectories::testFilesDirectory(), "DBAircraftIcaoB737Boeing.json");
|
||||
static const QString json =
|
||||
CFileUtils::readFileToString(CSwiftDirectories::testFilesDirectory(), "DBAircraftIcaoB737Boeing.json");
|
||||
static const CAircraftIcaoCode icao(CAircraftIcaoCode::fromJson(json));
|
||||
Q_ASSERT(icao.hasValidDbKey());
|
||||
return icao;
|
||||
@@ -239,7 +230,8 @@ namespace swift::misc::test
|
||||
|
||||
const CAircraftIcaoCode &CTestData::getDBAircraftIcaoC172()
|
||||
{
|
||||
static const QString json = CFileUtils::readFileToString(CSwiftDirectories::testFilesDirectory(), "DBAircraftIcaoC172Cessna.json");
|
||||
static const QString json =
|
||||
CFileUtils::readFileToString(CSwiftDirectories::testFilesDirectory(), "DBAircraftIcaoC172Cessna.json");
|
||||
static const CAircraftIcaoCode icao(CAircraftIcaoCode::fromJson(json));
|
||||
Q_ASSERT(icao.hasValidDbKey());
|
||||
return icao;
|
||||
@@ -247,7 +239,8 @@ namespace swift::misc::test
|
||||
|
||||
const CAirlineIcaoCode &CTestData::getDbAirlineIcaoDLH()
|
||||
{
|
||||
static const QString json = CFileUtils::readFileToString(CSwiftDirectories::testFilesDirectory(), "DBAirlineIcaoDLH.json");
|
||||
static const QString json =
|
||||
CFileUtils::readFileToString(CSwiftDirectories::testFilesDirectory(), "DBAirlineIcaoDLH.json");
|
||||
static const CAirlineIcaoCode icao(CAirlineIcaoCode::fromJson(json));
|
||||
Q_ASSERT(icao.hasValidDbKey());
|
||||
return icao;
|
||||
@@ -255,7 +248,8 @@ namespace swift::misc::test
|
||||
|
||||
const CAirlineIcaoCode &CTestData::getDbAirlineIcaoBAW()
|
||||
{
|
||||
static const QString json = CFileUtils::readFileToString(CSwiftDirectories::testFilesDirectory(), "DBAirlineIcaoBAW.json");
|
||||
static const QString json =
|
||||
CFileUtils::readFileToString(CSwiftDirectories::testFilesDirectory(), "DBAirlineIcaoBAW.json");
|
||||
static const CAirlineIcaoCode icao(CAirlineIcaoCode::fromJson(json));
|
||||
Q_ASSERT(icao.hasValidDbKey());
|
||||
return icao;
|
||||
@@ -263,7 +257,8 @@ namespace swift::misc::test
|
||||
|
||||
const CLivery &CTestData::getDbLiveryDLHStarAlliance()
|
||||
{
|
||||
static const QString json = CFileUtils::readFileToString(CSwiftDirectories::testFilesDirectory(), "DBLiveryDLHStarAlliance.json");
|
||||
static const QString json =
|
||||
CFileUtils::readFileToString(CSwiftDirectories::testFilesDirectory(), "DBLiveryDLHStarAlliance.json");
|
||||
static const CLivery livery(CLivery::fromJson(json));
|
||||
Q_ASSERT(livery.hasValidDbKey());
|
||||
return livery;
|
||||
@@ -271,7 +266,8 @@ namespace swift::misc::test
|
||||
|
||||
const CAircraftModel &CTestData::getDbAircraftModelFsxA2AC172Skyhawk()
|
||||
{
|
||||
static const QString json = CFileUtils::readFileToString(CSwiftDirectories::testFilesDirectory(), "DBModelFSXA2ACessnaC172.json");
|
||||
static const QString json =
|
||||
CFileUtils::readFileToString(CSwiftDirectories::testFilesDirectory(), "DBModelFSXA2ACessnaC172.json");
|
||||
static const CAircraftModel model(CAircraftModel::fromDatabaseJson(json::jsonObjectFromString(json)));
|
||||
Q_ASSERT(model.hasValidDbKey());
|
||||
Q_ASSERT(!model.getModelString().isEmpty());
|
||||
@@ -280,7 +276,8 @@ namespace swift::misc::test
|
||||
|
||||
const CAircraftModel &CTestData::getDbAircraftModelFsxAerosoftA320()
|
||||
{
|
||||
static const QString json = CFileUtils::readFileToString(CSwiftDirectories::testFilesDirectory(), "DBModelFSXAerosoftA320.json");
|
||||
static const QString json =
|
||||
CFileUtils::readFileToString(CSwiftDirectories::testFilesDirectory(), "DBModelFSXAerosoftA320.json");
|
||||
static const CAircraftModel model(CAircraftModel::fromDatabaseJson(json::jsonObjectFromString(json)));
|
||||
Q_ASSERT(model.hasValidDbKey());
|
||||
Q_ASSERT(!model.getModelString().isEmpty());
|
||||
@@ -290,7 +287,8 @@ namespace swift::misc::test
|
||||
CSimulatedAircraft getC172AircraftImpl()
|
||||
{
|
||||
CUser pilot = CTestData::getRandomPilot();
|
||||
CSimulatedAircraft aircraft(pilot.getCallsign(), CTestData::getDbAircraftModelFsxA2AC172Skyhawk(), pilot, CTestData::getAircraftSituationAboveMunichTower());
|
||||
CSimulatedAircraft aircraft(pilot.getCallsign(), CTestData::getDbAircraftModelFsxA2AC172Skyhawk(), pilot,
|
||||
CTestData::getAircraftSituationAboveMunichTower());
|
||||
CTransponder t = CTransponder(7000, CTransponder::ModeC);
|
||||
aircraft.setTransponder(t);
|
||||
aircraft.setCom1ActiveFrequency(CTestData::getRandomAtcStation().getFrequency());
|
||||
@@ -307,7 +305,8 @@ namespace swift::misc::test
|
||||
CSimulatedAircraft getA320AircraftImpl()
|
||||
{
|
||||
CUser pilot = CTestData::getRandomPilot();
|
||||
CSimulatedAircraft aircraft(pilot.getCallsign(), CTestData::getDbAircraftModelFsxAerosoftA320(), pilot, CTestData::getAircraftSituationAboveFrankfurtTower());
|
||||
CSimulatedAircraft aircraft(pilot.getCallsign(), CTestData::getDbAircraftModelFsxAerosoftA320(), pilot,
|
||||
CTestData::getAircraftSituationAboveFrankfurtTower());
|
||||
const CTransponder t = CTransponder(7000, CTransponder::ModeC);
|
||||
aircraft.setTransponder(t);
|
||||
aircraft.setCom1ActiveFrequency(CTestData::getRandomAtcStation().getFrequency());
|
||||
|
||||
@@ -33,10 +33,7 @@ namespace swift::misc::test
|
||||
CAtcStationList CTesting::createAtcStations(int number, bool byPropertyIndex)
|
||||
{
|
||||
CAtcStationList atcs;
|
||||
for (int i = 0; i < number; i++)
|
||||
{
|
||||
atcs.push_back(createStation(i, byPropertyIndex));
|
||||
}
|
||||
for (int i = 0; i < number; i++) { atcs.push_back(createStation(i, byPropertyIndex)); }
|
||||
return atcs;
|
||||
}
|
||||
|
||||
@@ -44,7 +41,8 @@ namespace swift::misc::test
|
||||
{
|
||||
// from WGS is slow, so static const (only 1 time init)
|
||||
// https://dev.vatsim-germany.org/issues/322#note-2
|
||||
static const CCoordinateGeodetic geoPos = CCoordinateGeodetic::fromWgs84("48° 21′ 13″ N", "11° 47′ 09″ E", CAltitude(index, CLengthUnit::ft()));
|
||||
static const CCoordinateGeodetic geoPos =
|
||||
CCoordinateGeodetic::fromWgs84("48° 21′ 13″ N", "11° 47′ 09″ E", CAltitude(index, CLengthUnit::ft()));
|
||||
const QString cs = QStringLiteral("%1MI-SNO_TWR").arg(index);
|
||||
const QString usr = QStringLiteral("Joe %1").arg(index);
|
||||
const QString id = QStringLiteral("00000%1").arg(index).right(6);
|
||||
@@ -59,19 +57,20 @@ namespace swift::misc::test
|
||||
{
|
||||
station.setPropertyByIndex(CAtcStation::IndexCallsign, CVariant::from(CCallsign(cs)));
|
||||
station.setPropertyByIndex(CAtcStation::IndexController, CVariant::from(user));
|
||||
station.setPropertyByIndex(CAtcStation::IndexFrequency, CVariant::from(CFrequency(f, CFrequencyUnit::MHz())));
|
||||
station.setPropertyByIndex(CAtcStation::IndexFrequency,
|
||||
CVariant::from(CFrequency(f, CFrequencyUnit::MHz())));
|
||||
station.setPropertyByIndex(CAtcStation::IndexRange, CVariant::from(CLength(50, CLengthUnit::km())));
|
||||
station.setPropertyByIndex(CAtcStation::IndexPosition, CVariant::from(geoPos));
|
||||
station.setPropertyByIndex(CAtcStation::IndexIsOnline, CVariant::from(false));
|
||||
station.setPropertyByIndex(CAtcStation::IndexRelativeDistance, CVariant::from(CLength(index + 1, CLengthUnit::NM())));
|
||||
station.setPropertyByIndex(CAtcStation::IndexRelativeDistance,
|
||||
CVariant::from(CLength(index + 1, CLengthUnit::NM())));
|
||||
station.setPropertyByIndex(CAtcStation::IndexAtis, CVariant::from(atis));
|
||||
station.setPropertyByIndex(CAtcStation::IndexMetar, CVariant::from(metar));
|
||||
}
|
||||
else
|
||||
{
|
||||
station = CAtcStation(CCallsign(cs, CCallsign::Atc), user,
|
||||
CFrequency(f, CFrequencyUnit::MHz()),
|
||||
geoPos, CLength(50, CLengthUnit::km()), false);
|
||||
station = CAtcStation(CCallsign(cs, CCallsign::Atc), user, CFrequency(f, CFrequencyUnit::MHz()), geoPos,
|
||||
CLength(50, CLengthUnit::km()), false);
|
||||
station.setRelativeDistance(CLength(index + 1, CLengthUnit::NM()));
|
||||
station.setAtis(atis);
|
||||
station.setMetar(metar);
|
||||
|
||||
@@ -31,19 +31,14 @@ using namespace swift::misc::network;
|
||||
|
||||
namespace swift::misc::test
|
||||
{
|
||||
CTestService::CTestService(QObject *parent) : QObject(parent)
|
||||
{}
|
||||
CTestService::CTestService(QObject *parent) : QObject(parent) {}
|
||||
|
||||
CTestService::CTestService(bool verbose, QObject *parent) : QObject(parent), m_verbose(verbose)
|
||||
{}
|
||||
CTestService::CTestService(bool verbose, QObject *parent) : QObject(parent), m_verbose(verbose) {}
|
||||
|
||||
bool CTestService::canRegisterTestService(QDBusConnection &connection)
|
||||
{
|
||||
const bool r = connection.registerService(CTestService::InterfaceName());
|
||||
if (r)
|
||||
{
|
||||
connection.unregisterService(CTestService::InterfaceName());
|
||||
}
|
||||
if (r) { connection.unregisterService(CTestService::InterfaceName()); }
|
||||
return r;
|
||||
}
|
||||
|
||||
@@ -61,7 +56,9 @@ namespace swift::misc::test
|
||||
|
||||
CTestService *CTestService::registerTestService(QDBusConnection &connection, bool verbose, QObject *parent)
|
||||
{
|
||||
CTestService *pTestService = new CTestService(verbose, parent); // just a QObject with signals / slots and Q_CLASSINFO("D-Bus Interface", some service name)
|
||||
CTestService *pTestService = new CTestService(
|
||||
verbose,
|
||||
parent); // just a QObject with signals / slots and Q_CLASSINFO("D-Bus Interface", some service name)
|
||||
if (!connection.registerService(CTestService::InterfaceName()))
|
||||
{
|
||||
QDBusError error = connection.lastError();
|
||||
@@ -71,7 +68,9 @@ namespace swift::misc::test
|
||||
qFatal("Could not register service!");
|
||||
}
|
||||
|
||||
if (!connection.registerObject(CTestService::ObjectPath(), pTestService, QDBusConnection::ExportAllSlots | QDBusConnection::ExportAllSignals | QDBusConnection::ExportAdaptors))
|
||||
if (!connection.registerObject(CTestService::ObjectPath(), pTestService,
|
||||
QDBusConnection::ExportAllSlots | QDBusConnection::ExportAllSignals |
|
||||
QDBusConnection::ExportAdaptors))
|
||||
{
|
||||
qFatal("Could not register service object!");
|
||||
}
|
||||
@@ -80,15 +79,12 @@ namespace swift::misc::test
|
||||
if (pTestService) { out() << "Service registered" << Qt::endl; }
|
||||
|
||||
QString service; // service not needed
|
||||
if (connection.connect(service, CTestService::ObjectPath(), CTestService::InterfaceName(),
|
||||
"sendStringMessage", pTestService, SLOT(receiveStringMessage(const QString &))))
|
||||
if (connection.connect(service, CTestService::ObjectPath(), CTestService::InterfaceName(), "sendStringMessage",
|
||||
pTestService, SLOT(receiveStringMessage(const QString &))))
|
||||
{
|
||||
out() << "Connected object with DBus 'sendStringMessage'" << Qt::endl;
|
||||
}
|
||||
else
|
||||
{
|
||||
qFatal("Cannot connect service with DBus");
|
||||
}
|
||||
else { qFatal("Cannot connect service with DBus"); }
|
||||
return pTestService;
|
||||
}
|
||||
|
||||
@@ -146,7 +142,8 @@ namespace swift::misc::test
|
||||
|
||||
void CTestService::receiveTransponder(const CTransponder &transponder) const
|
||||
{
|
||||
if (m_verbose) out() << "Pid: " << CTestService::getPid() << " Received transponder: " << transponder << Qt::endl;
|
||||
if (m_verbose)
|
||||
out() << "Pid: " << CTestService::getPid() << " Received transponder: " << transponder << Qt::endl;
|
||||
}
|
||||
|
||||
void CTestService::receiveTrack(const CTrack &track) const
|
||||
@@ -175,7 +172,8 @@ namespace swift::misc::test
|
||||
|
||||
void CTestService::receiveAtcStationList(const CAtcStationList &atcStationList) const
|
||||
{
|
||||
if (m_verbose) out() << "Pid: " << CTestService::getPid() << " Received ATC list: " << atcStationList << Qt::endl;
|
||||
if (m_verbose)
|
||||
out() << "Pid: " << CTestService::getPid() << " Received ATC list: " << atcStationList << Qt::endl;
|
||||
}
|
||||
|
||||
void CTestService::receiveValueMap(const swift::misc::CPropertyIndexVariantMap &valueMap) const
|
||||
@@ -202,37 +200,43 @@ namespace swift::misc::test
|
||||
|
||||
CAircraftParts CTestService::pingAircraftParts(const CAircraftParts &aircraftParts) const
|
||||
{
|
||||
if (m_verbose) out() << "Pid: " << CTestService::getPid() << " ping aircraft parts: " << aircraftParts << Qt::endl;
|
||||
if (m_verbose)
|
||||
out() << "Pid: " << CTestService::getPid() << " ping aircraft parts: " << aircraftParts << Qt::endl;
|
||||
return aircraftParts;
|
||||
}
|
||||
|
||||
CAircraftEngine CTestService::pingAircraftEngine(const CAircraftEngine &aircraftEngine) const
|
||||
{
|
||||
if (m_verbose) out() << "Pid: " << CTestService::getPid() << " ping aircraft engine: " << aircraftEngine << Qt::endl;
|
||||
if (m_verbose)
|
||||
out() << "Pid: " << CTestService::getPid() << " ping aircraft engine: " << aircraftEngine << Qt::endl;
|
||||
return aircraftEngine;
|
||||
}
|
||||
|
||||
CAircraftModel CTestService::pingAircraftModel(const CAircraftModel &aircraftModel) const
|
||||
{
|
||||
if (m_verbose) out() << "Pid: " << CTestService::getPid() << " ping aircraft model: " << aircraftModel << Qt::endl;
|
||||
if (m_verbose)
|
||||
out() << "Pid: " << CTestService::getPid() << " ping aircraft model: " << aircraftModel << Qt::endl;
|
||||
return aircraftModel;
|
||||
}
|
||||
|
||||
CAircraftModelList CTestService::pingAircraftModelList(const CAircraftModelList &aircraftModels) const
|
||||
{
|
||||
if (m_verbose) out() << "Pid: " << CTestService::getPid() << " ping aircraft modellist: " << aircraftModels << Qt::endl;
|
||||
if (m_verbose)
|
||||
out() << "Pid: " << CTestService::getPid() << " ping aircraft modellist: " << aircraftModels << Qt::endl;
|
||||
return aircraftModels;
|
||||
}
|
||||
|
||||
CAircraftLights CTestService::pingAircraftLights(const CAircraftLights &aircraftLights) const
|
||||
{
|
||||
if (m_verbose) out() << "Pid: " << CTestService::getPid() << " ping aircraft lights: " << aircraftLights << Qt::endl;
|
||||
if (m_verbose)
|
||||
out() << "Pid: " << CTestService::getPid() << " ping aircraft lights: " << aircraftLights << Qt::endl;
|
||||
return aircraftLights;
|
||||
}
|
||||
|
||||
CSimulatedAircraft CTestService::pingSimulatedAircraft(const CSimulatedAircraft &aircraft) const
|
||||
{
|
||||
if (m_verbose) out() << "Pid: " << CTestService::getPid() << " ping simulated aircraft: " << aircraft << Qt::endl;
|
||||
if (m_verbose)
|
||||
out() << "Pid: " << CTestService::getPid() << " ping simulated aircraft: " << aircraft << Qt::endl;
|
||||
return aircraft;
|
||||
}
|
||||
|
||||
@@ -250,7 +254,8 @@ namespace swift::misc::test
|
||||
|
||||
CPropertyIndexVariantMap CTestService::pingIndexVariantMap(const CPropertyIndexVariantMap &indexVariantMap) const
|
||||
{
|
||||
if (m_verbose) out() << "Pid: " << CTestService::getPid() << " ping properties: " << indexVariantMap << Qt::endl;
|
||||
if (m_verbose)
|
||||
out() << "Pid: " << CTestService::getPid() << " ping properties: " << indexVariantMap << Qt::endl;
|
||||
return indexVariantMap;
|
||||
}
|
||||
|
||||
@@ -316,11 +321,14 @@ namespace swift::misc::test
|
||||
|
||||
swift::misc::CVariant CTestService::pingCVariant(const CVariant &variant) const
|
||||
{
|
||||
if (m_verbose) out() << "Pid: " << CTestService::getPid() << " client sent back as CVariant: " << variant.toQString() << Qt::endl;
|
||||
if (m_verbose)
|
||||
out() << "Pid: " << CTestService::getPid() << " client sent back as CVariant: " << variant.toQString()
|
||||
<< Qt::endl;
|
||||
return variant;
|
||||
}
|
||||
|
||||
swift::misc::aviation::CFlightPlan CTestService::pingFlightPlan(const swift::misc::aviation::CFlightPlan &flightPlan) const
|
||||
swift::misc::aviation::CFlightPlan
|
||||
CTestService::pingFlightPlan(const swift::misc::aviation::CFlightPlan &flightPlan) const
|
||||
{
|
||||
if (m_verbose) out() << "Pid: " << CTestService::getPid() << " info: " << flightPlan << Qt::endl;
|
||||
return flightPlan;
|
||||
@@ -343,10 +351,7 @@ namespace swift::misc::test
|
||||
if (m_verbose) out() << "Pid: " << CTestService::getPid() << " getObjectPaths" << Qt::endl;
|
||||
QList<QDBusObjectPath> paths;
|
||||
paths.reserve(n);
|
||||
for (int i = 0; i < n; i++)
|
||||
{
|
||||
paths.append(QDBusObjectPath(ObjectPath()));
|
||||
}
|
||||
for (int i = 0; i < n; i++) { paths.append(QDBusObjectPath(ObjectPath())); }
|
||||
return paths;
|
||||
}
|
||||
} // namespace swift::misc::test
|
||||
|
||||
@@ -154,46 +154,58 @@ namespace swift::misc::test
|
||||
swift::misc::network::CUser pingUser(const swift::misc::network::CUser &user) const;
|
||||
|
||||
//! Ping situation
|
||||
swift::misc::aviation::CAircraftSituation pingSituation(const swift::misc::aviation::CAircraftSituation &situation) const;
|
||||
swift::misc::aviation::CAircraftSituation
|
||||
pingSituation(const swift::misc::aviation::CAircraftSituation &situation) const;
|
||||
|
||||
//! Ping ATC station
|
||||
swift::misc::aviation::CAtcStation pingAtcStation(const swift::misc::aviation::CAtcStation &station) const;
|
||||
|
||||
//! Ping transponder
|
||||
swift::misc::aviation::CTransponder pingTransponder(const swift::misc::aviation::CTransponder &transponder) const;
|
||||
swift::misc::aviation::CTransponder
|
||||
pingTransponder(const swift::misc::aviation::CTransponder &transponder) const;
|
||||
|
||||
//! Ping aircraft lights
|
||||
swift::misc::aviation::CAircraftLights pingAircraftLights(const swift::misc::aviation::CAircraftLights &aircraftLights) const;
|
||||
swift::misc::aviation::CAircraftLights
|
||||
pingAircraftLights(const swift::misc::aviation::CAircraftLights &aircraftLights) const;
|
||||
|
||||
//! Ping parts
|
||||
swift::misc::aviation::CAircraftParts pingAircraftParts(const swift::misc::aviation::CAircraftParts &aircraftParts) const;
|
||||
swift::misc::aviation::CAircraftParts
|
||||
pingAircraftParts(const swift::misc::aviation::CAircraftParts &aircraftParts) const;
|
||||
|
||||
//! Ping engine
|
||||
swift::misc::aviation::CAircraftEngine pingAircraftEngine(const swift::misc::aviation::CAircraftEngine &aircraftEngine) const;
|
||||
swift::misc::aviation::CAircraftEngine
|
||||
pingAircraftEngine(const swift::misc::aviation::CAircraftEngine &aircraftEngine) const;
|
||||
|
||||
//! Ping model
|
||||
swift::misc::simulation::CAircraftModel pingAircraftModel(const swift::misc::simulation::CAircraftModel &aircraftModel) const;
|
||||
swift::misc::simulation::CAircraftModel
|
||||
pingAircraftModel(const swift::misc::simulation::CAircraftModel &aircraftModel) const;
|
||||
|
||||
//! Ping model
|
||||
swift::misc::simulation::CAircraftModelList pingAircraftModelList(const swift::misc::simulation::CAircraftModelList &aircraftModels) const;
|
||||
swift::misc::simulation::CAircraftModelList
|
||||
pingAircraftModelList(const swift::misc::simulation::CAircraftModelList &aircraftModels) const;
|
||||
|
||||
//! Ping simulated aircraft
|
||||
swift::misc::simulation::CSimulatedAircraft pingSimulatedAircraft(const swift::misc::simulation::CSimulatedAircraft &aircraft) const;
|
||||
swift::misc::simulation::CSimulatedAircraft
|
||||
pingSimulatedAircraft(const swift::misc::simulation::CSimulatedAircraft &aircraft) const;
|
||||
|
||||
//! Ping ATC list
|
||||
swift::misc::aviation::CAtcStationList pingAtcStationList(const swift::misc::aviation::CAtcStationList &atcStationList) const;
|
||||
swift::misc::aviation::CAtcStationList
|
||||
pingAtcStationList(const swift::misc::aviation::CAtcStationList &atcStationList) const;
|
||||
|
||||
//! Ping aircraft list
|
||||
swift::misc::simulation::CSimulatedAircraftList pingAircraftList(const swift::misc::simulation::CSimulatedAircraftList &aircraftList) const;
|
||||
swift::misc::simulation::CSimulatedAircraftList
|
||||
pingAircraftList(const swift::misc::simulation::CSimulatedAircraftList &aircraftList) const;
|
||||
|
||||
//! Ping airports list
|
||||
swift::misc::aviation::CAirportList pingAirportList(const swift::misc::aviation::CAirportList &airportList) const;
|
||||
swift::misc::aviation::CAirportList
|
||||
pingAirportList(const swift::misc::aviation::CAirportList &airportList) const;
|
||||
|
||||
//! Ping property index
|
||||
swift::misc::CPropertyIndex pingPropertyIndex(const swift::misc::CPropertyIndex &properties) const;
|
||||
|
||||
//! Ping index variant map
|
||||
swift::misc::CPropertyIndexVariantMap pingIndexVariantMap(const swift::misc::CPropertyIndexVariantMap &indexVariantMap) const;
|
||||
swift::misc::CPropertyIndexVariantMap
|
||||
pingIndexVariantMap(const swift::misc::CPropertyIndexVariantMap &indexVariantMap) const;
|
||||
|
||||
//! Ping client
|
||||
swift::misc::network::CClient pingClient(const swift::misc::network::CClient &client) const;
|
||||
@@ -202,10 +214,12 @@ namespace swift::misc::test
|
||||
swift::misc::network::CClientList pingClientList(const swift::misc::network::CClientList &clientList) const;
|
||||
|
||||
//! Ping plugin info
|
||||
swift::misc::simulation::CSimulatorPluginInfo pingPluginInfo(const swift::misc::simulation::CSimulatorPluginInfo &info) const;
|
||||
swift::misc::simulation::CSimulatorPluginInfo
|
||||
pingPluginInfo(const swift::misc::simulation::CSimulatorPluginInfo &info) const;
|
||||
|
||||
//! Ping ICAO data object
|
||||
swift::misc::aviation::CAircraftIcaoCode pingAircraftIcaoData(const swift::misc::aviation::CAircraftIcaoCode &icao) const;
|
||||
swift::misc::aviation::CAircraftIcaoCode
|
||||
pingAircraftIcaoData(const swift::misc::aviation::CAircraftIcaoCode &icao) const;
|
||||
|
||||
//! Ping flight plan
|
||||
swift::misc::aviation::CFlightPlan pingFlightPlan(const swift::misc::aviation::CFlightPlan &flightPlan) const;
|
||||
|
||||
@@ -22,12 +22,12 @@ using namespace swift::misc::physical_quantities;
|
||||
|
||||
namespace swift::misc::test
|
||||
{
|
||||
ITestServiceInterface::ITestServiceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
|
||||
ITestServiceInterface::ITestServiceInterface(const QString &service, const QString &path,
|
||||
const QDBusConnection &connection, QObject *parent)
|
||||
: QDBusAbstractInterface(service, path, ITestServiceInterface::InterfaceName(), connection, parent)
|
||||
{}
|
||||
|
||||
ITestServiceInterface::~ITestServiceInterface()
|
||||
{}
|
||||
ITestServiceInterface::~ITestServiceInterface() {}
|
||||
|
||||
int ITestServiceInterface::pingTests(ITestServiceInterface &testServiceInterface, bool verbose)
|
||||
{
|
||||
|
||||
@@ -64,7 +64,8 @@ namespace swift::misc::test
|
||||
|
||||
public:
|
||||
//! Constructor
|
||||
ITestServiceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
|
||||
ITestServiceInterface(const QString &service, const QString &path, const QDBusConnection &connection,
|
||||
QObject *parent = nullptr);
|
||||
|
||||
//! Destructor
|
||||
virtual ~ITestServiceInterface();
|
||||
@@ -80,7 +81,8 @@ namespace swift::misc::test
|
||||
return asyncCallWithArgumentList(QLatin1String("getAtcStation"), argumentList);
|
||||
}
|
||||
|
||||
QDBusPendingReply<swift::misc::simulation::fscommon::CAircraftCfgEntriesList> getAircraftCfgEntriesList(int number)
|
||||
QDBusPendingReply<swift::misc::simulation::fscommon::CAircraftCfgEntriesList>
|
||||
getAircraftCfgEntriesList(int number)
|
||||
{
|
||||
QList<QVariant> argumentList;
|
||||
argumentList << QVariant::fromValue(number);
|
||||
@@ -107,14 +109,16 @@ namespace swift::misc::test
|
||||
return asyncCallWithArgumentList(QLatin1String("getSpeed"), argumentList);
|
||||
}
|
||||
|
||||
QDBusPendingReply<swift::misc::aviation::CAltitude> pingAltitude(const swift::misc::aviation::CAltitude &altitude)
|
||||
QDBusPendingReply<swift::misc::aviation::CAltitude>
|
||||
pingAltitude(const swift::misc::aviation::CAltitude &altitude)
|
||||
{
|
||||
QList<QVariant> argumentList;
|
||||
argumentList << QVariant::fromValue(altitude);
|
||||
return asyncCallWithArgumentList(QLatin1String("pingAltitude"), argumentList);
|
||||
}
|
||||
|
||||
QDBusPendingReply<swift::misc::aviation::CAircraftSituation> pingSituation(const swift::misc::aviation::CAircraftSituation &situation)
|
||||
QDBusPendingReply<swift::misc::aviation::CAircraftSituation>
|
||||
pingSituation(const swift::misc::aviation::CAircraftSituation &situation)
|
||||
{
|
||||
QList<QVariant> argumentList;
|
||||
argumentList << QVariant::fromValue(situation);
|
||||
@@ -128,105 +132,120 @@ namespace swift::misc::test
|
||||
return asyncCallWithArgumentList(QLatin1String("pingUser"), argumentList);
|
||||
}
|
||||
|
||||
QDBusPendingReply<swift::misc::aviation::CTransponder> pingTransponder(const swift::misc::aviation::CTransponder &transponder)
|
||||
QDBusPendingReply<swift::misc::aviation::CTransponder>
|
||||
pingTransponder(const swift::misc::aviation::CTransponder &transponder)
|
||||
{
|
||||
QList<QVariant> argumentList;
|
||||
argumentList << QVariant::fromValue(transponder);
|
||||
return asyncCallWithArgumentList(QLatin1String("pingTransponder"), argumentList);
|
||||
}
|
||||
|
||||
QDBusPendingReply<swift::misc::aviation::CAtcStation> pingAtcStation(const swift::misc::aviation::CAtcStation &station)
|
||||
QDBusPendingReply<swift::misc::aviation::CAtcStation>
|
||||
pingAtcStation(const swift::misc::aviation::CAtcStation &station)
|
||||
{
|
||||
QList<QVariant> argumentList;
|
||||
argumentList << QVariant::fromValue(station);
|
||||
return asyncCallWithArgumentList(QLatin1String("pingAtcStation"), argumentList);
|
||||
}
|
||||
|
||||
QDBusPendingReply<swift::misc::aviation::CAircraftIcaoCode> pingAircraftIcaoData(const swift::misc::aviation::CAircraftIcaoCode &icaoData)
|
||||
QDBusPendingReply<swift::misc::aviation::CAircraftIcaoCode>
|
||||
pingAircraftIcaoData(const swift::misc::aviation::CAircraftIcaoCode &icaoData)
|
||||
{
|
||||
QList<QVariant> argumentList;
|
||||
argumentList << QVariant::fromValue(icaoData);
|
||||
return asyncCallWithArgumentList(QLatin1String("pingAircraftIcaoData"), argumentList);
|
||||
}
|
||||
|
||||
QDBusPendingReply<swift::misc::aviation::CAircraftLights> pingAircraftLights(const swift::misc::aviation::CAircraftLights &lights)
|
||||
QDBusPendingReply<swift::misc::aviation::CAircraftLights>
|
||||
pingAircraftLights(const swift::misc::aviation::CAircraftLights &lights)
|
||||
{
|
||||
QList<QVariant> argumentList;
|
||||
argumentList << QVariant::fromValue(lights);
|
||||
return asyncCallWithArgumentList(QLatin1String("pingAircraftLights"), argumentList);
|
||||
}
|
||||
|
||||
QDBusPendingReply<swift::misc::aviation::CAircraftParts> pingAircraftParts(const swift::misc::aviation::CAircraftParts &parts)
|
||||
QDBusPendingReply<swift::misc::aviation::CAircraftParts>
|
||||
pingAircraftParts(const swift::misc::aviation::CAircraftParts &parts)
|
||||
{
|
||||
QList<QVariant> argumentList;
|
||||
argumentList << QVariant::fromValue(parts);
|
||||
return asyncCallWithArgumentList(QLatin1String("pingAircraftParts"), argumentList);
|
||||
}
|
||||
|
||||
QDBusPendingReply<swift::misc::aviation::CAircraftEngine> pingAircraftEngine(const swift::misc::aviation::CAircraftEngine &engine)
|
||||
QDBusPendingReply<swift::misc::aviation::CAircraftEngine>
|
||||
pingAircraftEngine(const swift::misc::aviation::CAircraftEngine &engine)
|
||||
{
|
||||
QList<QVariant> argumentList;
|
||||
argumentList << QVariant::fromValue(engine);
|
||||
return asyncCallWithArgumentList(QLatin1String("pingAircraftEngine"), argumentList);
|
||||
}
|
||||
|
||||
QDBusPendingReply<swift::misc::simulation::CAircraftModel> pingAircraftModel(const swift::misc::simulation::CAircraftModel &model)
|
||||
QDBusPendingReply<swift::misc::simulation::CAircraftModel>
|
||||
pingAircraftModel(const swift::misc::simulation::CAircraftModel &model)
|
||||
{
|
||||
QList<QVariant> argumentList;
|
||||
argumentList << QVariant::fromValue(model);
|
||||
return asyncCallWithArgumentList(QLatin1String("pingAircraftModel"), argumentList);
|
||||
}
|
||||
|
||||
QDBusPendingReply<swift::misc::simulation::CAircraftModelList> pingAircraftModelList(const swift::misc::simulation::CAircraftModelList &model)
|
||||
QDBusPendingReply<swift::misc::simulation::CAircraftModelList>
|
||||
pingAircraftModelList(const swift::misc::simulation::CAircraftModelList &model)
|
||||
{
|
||||
QList<QVariant> argumentList;
|
||||
argumentList << QVariant::fromValue(model);
|
||||
return asyncCallWithArgumentList(QLatin1String("pingAircraftModelList"), argumentList);
|
||||
}
|
||||
|
||||
QDBusPendingReply<swift::misc::simulation::CSimulatedAircraft> pingSimulatedAircraft(const swift::misc::simulation::CSimulatedAircraft &aircraft)
|
||||
QDBusPendingReply<swift::misc::simulation::CSimulatedAircraft>
|
||||
pingSimulatedAircraft(const swift::misc::simulation::CSimulatedAircraft &aircraft)
|
||||
{
|
||||
QList<QVariant> argumentList;
|
||||
argumentList << QVariant::fromValue(aircraft);
|
||||
return asyncCallWithArgumentList(QLatin1String("pingSimulatedAircraft"), argumentList);
|
||||
}
|
||||
|
||||
QDBusPendingReply<swift::misc::simulation::CSimulatorPluginInfo> pingPluginInfo(const swift::misc::simulation::CSimulatorPluginInfo &info)
|
||||
QDBusPendingReply<swift::misc::simulation::CSimulatorPluginInfo>
|
||||
pingPluginInfo(const swift::misc::simulation::CSimulatorPluginInfo &info)
|
||||
{
|
||||
QList<QVariant> argumentList;
|
||||
argumentList << QVariant::fromValue(info);
|
||||
return asyncCallWithArgumentList(QLatin1String("pingPluginInfo"), argumentList);
|
||||
}
|
||||
|
||||
QDBusPendingReply<swift::misc::aviation::CAtcStationList> pingAtcStationList(const swift::misc::aviation::CAtcStationList &atcStationList)
|
||||
QDBusPendingReply<swift::misc::aviation::CAtcStationList>
|
||||
pingAtcStationList(const swift::misc::aviation::CAtcStationList &atcStationList)
|
||||
{
|
||||
QList<QVariant> argumentList;
|
||||
argumentList << QVariant::fromValue(atcStationList);
|
||||
return asyncCallWithArgumentList(QLatin1String("pingAtcStationList"), argumentList);
|
||||
}
|
||||
|
||||
QDBusPendingReply<swift::misc::physical_quantities::CSpeed> pingSpeed(const swift::misc::physical_quantities::CSpeed &speed)
|
||||
QDBusPendingReply<swift::misc::physical_quantities::CSpeed>
|
||||
pingSpeed(const swift::misc::physical_quantities::CSpeed &speed)
|
||||
{
|
||||
QList<QVariant> argumentList;
|
||||
argumentList << QVariant::fromValue(speed);
|
||||
return asyncCallWithArgumentList(QLatin1String("pingSpeed"), argumentList);
|
||||
}
|
||||
|
||||
QDBusPendingReply<swift::misc::simulation::CSimulatedAircraftList> pingAircraftList(const swift::misc::simulation::CSimulatedAircraftList &aircraftList)
|
||||
QDBusPendingReply<swift::misc::simulation::CSimulatedAircraftList>
|
||||
pingAircraftList(const swift::misc::simulation::CSimulatedAircraftList &aircraftList)
|
||||
{
|
||||
QList<QVariant> argumentList;
|
||||
argumentList << QVariant::fromValue(aircraftList);
|
||||
return asyncCallWithArgumentList(QLatin1String("pingAircraftList"), argumentList);
|
||||
}
|
||||
|
||||
QDBusPendingReply<swift::misc::aviation::CAirportList> pingAirportList(const swift::misc::aviation::CAirportList &airportList)
|
||||
QDBusPendingReply<swift::misc::aviation::CAirportList>
|
||||
pingAirportList(const swift::misc::aviation::CAirportList &airportList)
|
||||
{
|
||||
QList<QVariant> argumentList;
|
||||
argumentList << QVariant::fromValue(airportList);
|
||||
return asyncCallWithArgumentList(QLatin1String("pingAirportList"), argumentList);
|
||||
}
|
||||
|
||||
QDBusPendingReply<swift::misc::network::CClientList> pingClientList(const swift::misc::network::CClientList &clientList)
|
||||
QDBusPendingReply<swift::misc::network::CClientList>
|
||||
pingClientList(const swift::misc::network::CClientList &clientList)
|
||||
{
|
||||
QList<QVariant> argumentList;
|
||||
argumentList << QVariant::fromValue(clientList);
|
||||
@@ -254,7 +273,8 @@ namespace swift::misc::test
|
||||
return asyncCallWithArgumentList(QLatin1String("pingPropertyIndex"), argumentList);
|
||||
}
|
||||
|
||||
QDBusPendingReply<swift::misc::CPropertyIndexVariantMap> pingIndexVariantMap(const swift::misc::CPropertyIndexVariantMap &indexVariantMap)
|
||||
QDBusPendingReply<swift::misc::CPropertyIndexVariantMap>
|
||||
pingIndexVariantMap(const swift::misc::CPropertyIndexVariantMap &indexVariantMap)
|
||||
{
|
||||
QList<QVariant> argumentList;
|
||||
argumentList << QVariant::fromValue(indexVariantMap);
|
||||
@@ -268,7 +288,8 @@ namespace swift::misc::test
|
||||
return asyncCallWithArgumentList(QLatin1String("pingFlightPlan"), argumentList);
|
||||
}
|
||||
|
||||
QDBusPendingReply<swift::misc::aviation::CAltitude> receiveAltitude(const swift::misc::aviation::CAltitude &altitude)
|
||||
QDBusPendingReply<swift::misc::aviation::CAltitude>
|
||||
receiveAltitude(const swift::misc::aviation::CAltitude &altitude)
|
||||
{
|
||||
QList<QVariant> argumentList;
|
||||
argumentList << QVariant::fromValue(altitude);
|
||||
@@ -384,14 +405,14 @@ namespace swift::misc::test
|
||||
|
||||
//! Compare objects and output info
|
||||
template <class ValueObject>
|
||||
static bool pingCompare(const ValueObject &in, const ValueObject &out, QTextStream &ts, bool verbose, int &errors)
|
||||
static bool pingCompare(const ValueObject &in, const ValueObject &out, QTextStream &ts, bool verbose,
|
||||
int &errors)
|
||||
{
|
||||
const bool equal = (in == out && extraCompare(in, out));
|
||||
if (!equal)
|
||||
{
|
||||
errors++;
|
||||
if (verbose) { ts << "I: " << in.toQString() << Qt::endl
|
||||
<< "O: " << out.toQString() << Qt::endl; }
|
||||
if (verbose) { ts << "I: " << in.toQString() << Qt::endl << "O: " << out.toQString() << Qt::endl; }
|
||||
}
|
||||
return equal;
|
||||
}
|
||||
@@ -404,7 +425,8 @@ namespace swift::misc::test
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool extraCompare(const swift::misc::aviation::CFlightPlan &in, const swift::misc::aviation::CFlightPlan &out)
|
||||
static bool extraCompare(const swift::misc::aviation::CFlightPlan &in,
|
||||
const swift::misc::aviation::CFlightPlan &out)
|
||||
{
|
||||
// flight plan: check units are preserved
|
||||
if (in.getEnrouteTime().getUnit() != out.getEnrouteTime().getUnit()) { return false; }
|
||||
|
||||
Reference in New Issue
Block a user