DBus: track, heading, transponder. Added I18N for track/heading, added further I18N keys. Of course not all I18N strings are translated yet.

This commit is contained in:
Klaus Basan
2013-07-28 03:20:04 +02:00
parent 40a97c3d82
commit a53ea0c5fd
29 changed files with 620 additions and 81 deletions

View File

@@ -34,5 +34,13 @@
<arg name="geo" type="((didb(s)(s))(didb(s)(s))(didb(s)(s)))" direction="in"/>
<annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::Geo::CCoordinateGeodetic"/>
</method>
<method name="receiveTransponder">
<arg name="transponder" type="(sii)" direction="in"/>
<annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::Aviation::CTransponder"/>
</method>
<method name="receiveTrack">
<arg name="track" type="(didb(s)(s)b)" direction="in"/>
<annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::Aviation::CTrack"/>
</method>
</interface>
</node>

View File

@@ -75,7 +75,10 @@ int main(int argc, char *argv[])
} else {
qDebug() << "Already registered, assuming 2nd pid: " << TestserviceTool::getPid();
BlackmisctestTestserviceInterface testserviceInterface(Testservice::ServiceName, Testservice::ServicePath, connection, &a);
double speedValue = 200.0;
CSpeed speed(200, BlackMisc::PhysicalQuantities::CSpeedUnit::km_h());
CAltitude al(1000, true, CLengthUnit::ft());
while (true) {
QDBusMessage m = QDBusMessage::createSignal(
Testservice::ServicePath, Testservice::ServiceName,
@@ -103,7 +106,6 @@ int main(int argc, char *argv[])
qDebug() << "Send list via interface" << list;
// PQs
CSpeed speed(speedValue++, BlackMisc::PhysicalQuantities::CSpeedUnit::km_h());
testserviceInterface.receiveSpeed(speed);
qDebug() << "Send speed via interface" << speed;
@@ -111,17 +113,28 @@ int main(int argc, char *argv[])
testserviceInterface.receiveSpeed(speed);
qDebug() << "Send speed via interface" << speed;
TestserviceTool::sleep(2500);
speed.switchUnit(CSpeedUnit::km_h());
speed.addUnitValue(1.0);
// Aviation
CComSystem comSystem = CComSystem("DBUS COM1", CPhysicalQuantitiesConstants::FrequencyInternationalAirDistress(), CPhysicalQuantitiesConstants::FrequencyUnicom());
testserviceInterface.receiveComUnit(comSystem);
qDebug() << "Send COM via interface" << comSystem;
CAltitude al(1000, true, CLengthUnit::ft());
QDBusVariant qv(QVariant::fromValue(al));
testserviceInterface.receiveVariant(qv);
testserviceInterface.receiveAltitude(al);
qDebug() << "Send altitude via interface" << al;
al.addUnitValue(1);
CTransponder transponder("transponder", 7000, CTransponder::ModeC);
testserviceInterface.receiveTransponder(transponder);
qDebug() << "Send transponder via interface" << transponder;
CTrack track(123.45, true, CAngleUnit::deg());
testserviceInterface.receiveTrack(track);
qDebug() << "Send track via interface" << track;
TestserviceTool::sleep(2500);
// Math

View File

@@ -85,4 +85,20 @@ void Testservice::receiveGeoPosition(const BlackMisc::Geo::CCoordinateGeodetic &
qDebug() << "Pid:" << TestserviceTool::getPid() << "Received geo data:" << geo;
}
/*
* Receive transponder
*/
void Testservice::receiveTransponder(const BlackMisc::Aviation::CTransponder &transponder)
{
qDebug() << "Pid:" << TestserviceTool::getPid() << "Received transponder:" << transponder;
}
/*
* Receive track
*/
void Testservice::receiveTrack(const BlackMisc::Aviation::CTrack &track)
{
qDebug() << "Pid:" << TestserviceTool::getPid() << "Received track:" << track;
}
} // namespace

View File

@@ -94,6 +94,18 @@ public slots:
*/
void receiveGeoPosition(const BlackMisc::Geo::CCoordinateGeodetic &geo);
/*!
* \brief Receive transponder
* \param transponder
*/
void receiveTransponder(const BlackMisc::Aviation::CTransponder &transponder);
/*!
* \brief Receive track
* \param track
*/
void receiveTrack(const BlackMisc::Aviation::CTrack &track);
public:
static const QString ServiceName;
static const QString ServicePath;