flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-08-11 20:29:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #411, some more DBus tests and some minor adjustments found in course of action

Browse Source
This commit is contained in:
Klaus Basan
2015-04-27 12:09:53 +02:00
committed by Mathew Sutcliffe
parent 1b9878fdd3
commit 4aa5f8069e
8 changed files with 212 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
samples/blackmiscdbus/servicetool.cpp
View File

@@ -255,7 +255,8 @@ namespace BlackMiscTest
// on the client's side
TestServiceInterface testserviceInterface(Testservice::ServiceName, Testservice::ServicePath, connection);
CSpeed speed(200, BlackMisc::PhysicalQuantities::CSpeedUnit::km_h());
CSpeed speed(200, CSpeedUnit::km_h());
CSpeed speedNull(0, CSpeedUnit::nullUnit());
CAltitude al(1000, CAltitude::MeanSeaLevel, CLengthUnit::ft());
QTextStream qtin(stdin);
QString line;
@@ -289,7 +290,8 @@ namespace BlackMiscTest
// PQs
testserviceInterface.receiveSpeed(speed);
qDebug() << "Send speed via interface" << speed;
testserviceInterface.receiveSpeed(speedNull);
qDebug() << "Send null speed via interface" << speedNull;
speed.switchUnit(CSpeedUnit::kts());
testserviceInterface.receiveSpeed(speed);
qDebug() << "Send speed via interface" << speed;
@@ -367,8 +369,22 @@ namespace BlackMiscTest
qDebug() << "Pinged ATC station via interface"
<< ((station == stationReceived) ? "OK" : "ERROR!") << stationReceived;
CUser pingUser("223344", "Ping Me user");
CUser userReceived = testserviceInterface.pingUser(pingUser);
qDebug() << "Pinged user via interface"
<< ((userReceived == pingUser) ? "OK" : "ERROR!") << userReceived;
CAircraftSituation situation;
CAircraftSituation situationReceived = testserviceInterface.pingSituation(situation);
qDebug() << "Pinged situation via interface"
<< ((situation == situationReceived) ? "OK" : "ERROR!") << situationReceived;
CTransponder transponderReceived = testserviceInterface.pingTransponder(transponder);
qDebug() << "Pinged transponder via interface"
<< ((transponderReceived == transponder) ? "OK" : "ERROR!") << transponderReceived;
CAircraft aircraft(callsign, CUser("123456", "Joe Pilot"), situation);
aircraft.setTransponder(transponder);
CAircraft aircraftReceived = testserviceInterface.pingAircraft(aircraft);
qDebug() << "Pinged aircraft via interface"
<< ((aircraft == aircraftReceived) ? "OK" : "ERROR!") << aircraftReceived;

27
samples/blackmiscdbus/testservice.cpp
View File

@@ -300,6 +300,33 @@ namespace BlackMiscTest
return altitude;
}
/*
* Ping user
*/
CUser Testservice::pingUser(const CUser &user)
{
qDebug() << "Pid:" << ServiceTool::getPid() << "ping user:" << user;
return user;
}
/*
* Ping situation
*/
BlackMisc::Aviation::CAircraftSituation Testservice::pingSituation(const BlackMisc::Aviation::CAircraftSituation &situation)
{
qDebug() << "Pid:" << ServiceTool::getPid() << "ping situation:" << situation;
return situation;
}
/*
* Ping transponder
*/
BlackMisc::Aviation::CTransponder Testservice::pingTransponder(const BlackMisc::Aviation::CTransponder &transponder)
{
qDebug() << "Pid:" << ServiceTool::getPid() << "ping transponder:" << transponder;
return transponder;
}
/*
* Ping ATC station
*/

13
samples/blackmiscdbus/testservice.h
View File

@@ -100,15 +100,24 @@ namespace BlackMiscTest
//! Receive an value map
void receiveValueMap(const BlackMisc::CPropertyIndexVariantMap &valueMap) const;
//! Receive speed
//! Ping speed
BlackMisc::PhysicalQuantities::CSpeed pingSpeed(const BlackMisc::PhysicalQuantities::CSpeed &speed);
//! Receive altitude
//! Ping altitude
BlackMisc::Aviation::CAltitude pingAltitude(const BlackMisc::Aviation::CAltitude &altitude);
//! Ping user
BlackMisc::Network::CUser pingUser(const BlackMisc::Network::CUser &user);
//! Ping situation
BlackMisc::Aviation::CAircraftSituation pingSituation(const BlackMisc::Aviation::CAircraftSituation &situation);
//! Ping ATC station
BlackMisc::Aviation::CAtcStation pingAtcStation(const BlackMisc::Aviation::CAtcStation &station);
//! Ping transponder
BlackMisc::Aviation::CTransponder pingTransponder(const BlackMisc::Aviation::CTransponder &transponder);
//! Ping aircraft
BlackMisc::Aviation::CAircraft pingAircraft(const BlackMisc::Aviation::CAircraft &aircraft);

21
samples/blackmiscdbus/testservice_interface.h
View File

@@ -94,6 +94,27 @@ namespace BlackMiscTest
return asyncCallWithArgumentList(QLatin1String("pingAltitude"), argumentList);
}
inline QDBusPendingReply<BlackMisc::Aviation::CAircraftSituation> pingSituation(BlackMisc::Aviation::CAircraftSituation situation)
{
QList<QVariant> argumentList;
argumentList << QVariant::fromValue(situation);
return asyncCallWithArgumentList(QLatin1String("pingSituation"), argumentList);
}
inline QDBusPendingReply<BlackMisc::Network::CUser> pingUser(BlackMisc::Network::CUser user)
{
QList<QVariant> argumentList;
argumentList << QVariant::fromValue(user);
return asyncCallWithArgumentList(QLatin1String("pingUser"), argumentList);
}
inline QDBusPendingReply<BlackMisc::Aviation::CTransponder> pingTransponder(BlackMisc::Aviation::CTransponder transponder)
{
QList<QVariant> argumentList;
argumentList << QVariant::fromValue(transponder);
return asyncCallWithArgumentList(QLatin1String("pingTransponder"), argumentList);
}
inline QDBusPendingReply<BlackMisc::Aviation::CAtcStation> pingAtcStation(BlackMisc::Aviation::CAtcStation station)
{
QList<QVariant> argumentList;