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

refs #140, changed CValueObject classes to tupel concept

Browse Source 
Remarks: Changes looking like an added file result from the shift of namespace voice -> audio
This commit is contained in:
Klaus Basan
2014-03-10 14:48:56 +01:00
parent 8f6a22e833
commit 34320ad3e1
43 changed files with 1293 additions and 768 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/blackmisc/avtrack.h
View File

@@ -5,6 +5,8 @@
#ifndef BLACKMISC_AVTRACK_H
#define BLACKMISC_AVTRACK_H
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackmisc/pqangle.h"
namespace BlackMisc
@@ -30,24 +32,22 @@ namespace BlackMisc
};
private:
BLACK_ENABLE_TUPLE_CONVERSION(CTrack)
ReferenceNorth m_north; //!< magnetic or true?
protected:
/*!
* \copydoc CValueObject::convertToQString
*/
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
/*!
* \copydoc CValueObject::marshallToDbus
*/
//! \copydoc CValueObject::marshallFromDbus()
virtual void marshallToDbus(QDBusArgument &argument) const override;
/*!
* \copydoc CValueObject::unmarshallFromDbus
*/
//! \copydoc CValueObject::unmarshallFromDbus()
virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
//! \copydoc CValueObject::compareImpl
virtual int compareImpl(const CValueObject &other) const override;
public:
/*!
* \brief Default constructor: 0 Track magnetic
@@ -69,63 +69,47 @@ namespace BlackMisc
*/
CTrack(BlackMisc::PhysicalQuantities::CAngle track, ReferenceNorth north) : BlackMisc::PhysicalQuantities::CAngle(track), m_north(north) {}
/*!
* \copydoc CValueObject::toQVariant
*/
//! \copydoc CValueObject::toQVariant
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}
/*!
* \brief Equal operator ==
* \param other
* \return
*/
//! \copydoc CValueObject::getValueHash
virtual uint getValueHash() const override;
//! \brief Equal operator ==
bool operator ==(const CTrack &other) const;
/*!
* \brief Unequal operator ==
* \param other
* \return
*/
//! \brief Unequal operator !=
bool operator !=(const CTrack &other) const;
/*!
* \brief Magnetic Track?
* \return
*/
//! \brief Magnetic Track?
bool isMagneticTrack() const
{
return Magnetic == this->m_north;
(void)QT_TRANSLATE_NOOP("Aviation", "magnetic");
}
/*!
* \brief True Track?
* \return
*/
//! \brief True Track?
bool isTrueTrack() const
{
return True == this->m_north;
(void)QT_TRANSLATE_NOOP("Aviation", "true");
}
/*!
* \brief Get reference north (magnetic or true)
* \return
*/
//! \brief Get reference north (magnetic or true)
ReferenceNorth getReferenceNorth() const { return m_north; }
/*!
* \brief Register metadata
*/
//! \brief Register metadata
static void registerMetadata();
};
} // namespace
} // namespace
BLACK_DBUS_ENUM_MARSHALLING(BlackMisc::Aviation::CTrack::ReferenceNorth)
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CTrack, (o.m_north))
Q_DECLARE_METATYPE(BlackMisc::Aviation::CTrack)
#endif // guard