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

use enums instead of bools to distinguish true/magnetic headings and tracks and MSL/AGL altitudes

Browse Source
This commit is contained in:
Mathew Sutcliffe
2013-08-19 18:11:54 +01:00
parent 5f267e8245
commit cec9de5cc5
12 changed files with 104 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/blackmisc/avtrack.h
View File

@@ -18,8 +18,18 @@ namespace Aviation
*/
class CTrack : public BlackMisc::PhysicalQuantities::CAngle
{
public:
/*!
* Enum type to distinguish between true north and magnetic north
*/
enum ReferenceNorth
{
Magnetic = 0, //!< magnetic north
True = 1, //!< true north
};
private:
bool m_magnetic; //!< magnetic or true Track?
ReferenceNorth m_north; //!< magnetic or true?
protected:
/*!
@@ -35,7 +45,7 @@ protected:
virtual void marshallToDbus(QDBusArgument &argument) const
{
this->CAngle::marshallToDbus(argument);
argument << this->m_magnetic;
argument << qint32(this->m_north);
}
/*!
@@ -45,37 +55,31 @@ protected:
virtual void unmarshallFromDbus(const QDBusArgument &argument)
{
this->CAngle::unmarshallFromDbus(argument);
argument >> this->m_magnetic;
qint32 north;
argument >> north;
this->m_north = static_cast<ReferenceNorth>(north);
}
public:
/*!
* \brief Default constructor: 0 Track magnetic
*/
CTrack() : BlackMisc::PhysicalQuantities::CAngle(0, BlackMisc::PhysicalQuantities::CAngleUnit::rad()), m_magnetic(true) {}
CTrack() : BlackMisc::PhysicalQuantities::CAngle(0, BlackMisc::PhysicalQuantities::CAngleUnit::rad()), m_north(Magnetic) {}
/*!
* \brief Constructor
* \param value
* \param magnetic
* \param north
* \param unit
*/
CTrack(double value, bool magnetic, const BlackMisc::PhysicalQuantities::CAngleUnit &unit) : BlackMisc::PhysicalQuantities::CAngle(value, unit), m_magnetic(magnetic) {}
/*!
* \brief Constructor
* \param value
* \param magnetic
* \param unit
*/
CTrack(int value, bool magnetic, const BlackMisc::PhysicalQuantities::CAngleUnit &unit) : BlackMisc::PhysicalQuantities::CAngle(value, unit), m_magnetic(magnetic) {}
CTrack(double value, ReferenceNorth north, const BlackMisc::PhysicalQuantities::CAngleUnit &unit) : BlackMisc::PhysicalQuantities::CAngle(value, unit), m_north(north) {}
/*!
* \brief Constructor by CAngle
* \param track
* \param magnetic
* \param north
*/
CTrack(BlackMisc::PhysicalQuantities::CAngle track, bool magnetic) : BlackMisc::PhysicalQuantities::CAngle(track), m_magnetic(magnetic) {}
CTrack(BlackMisc::PhysicalQuantities::CAngle track, ReferenceNorth north) : BlackMisc::PhysicalQuantities::CAngle(track), m_north(north) {}
/*!
* \brief Equal operator ==
@@ -97,9 +101,8 @@ public:
*/
bool isMagneticTrack() const
{
return this->m_magnetic;
return Magnetic == this->m_north;
(void)QT_TRANSLATE_NOOP("Aviation", "magnetic");
(void)QT_TRANSLATE_NOOP("Aviation", "true");
}
/*!
@@ -108,9 +111,16 @@ public:
*/
bool isTrueTrack() const
{
return !this->m_magnetic;
return True == this->m_north;
(void)QT_TRANSLATE_NOOP("Aviation", "true");
}
/*!
* \brief Get reference north (magnetic or true)
* \return
*/
ReferenceNorth getReferenceNorth() const { return m_north; }
/*!
* \brief Register metadata
*/