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

Ref T268, compare for CAltitude

Browse Source
This commit is contained in:
Klaus Basan
2018-07-10 17:15:25 +02:00
parent c8aabd675e
commit b74de43ce0
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/blackmisc/aviation/altitude.cpp
View File

@@ -8,11 +8,12 @@
*/
#include "blackmisc/aviation/altitude.h"
#include "blackmisc/iconlist.h"
#include "blackmisc/icons.h"
#include "blackmisc/pq/measurementunit.h"
#include "blackmisc/pq/constants.h"
#include "blackmisc/pq/pqstring.h"
#include "blackmisc/comparefunctions.h"
#include "blackmisc/iconlist.h"
#include "blackmisc/icons.h"
#include <Qt>
#include <QtGlobal>
@@ -337,6 +338,15 @@ namespace BlackMisc
return BlackMisc::CIcon::iconByIndex(CIcons::GeoPosition);
}
int CAltitude::compare(const CAltitude &otherAltitude) const
{
if (this->getReferenceDatum() != otherAltitude.getReferenceDatum())
{
return Compare::compare(static_cast<int>(this->getReferenceDatum()), static_cast<int>(otherAltitude.getReferenceDatum()));
}
return CLength::compare(*this, otherAltitude);
}
const CAltitude &CAltitude::null()
{
static const CAltitude null(0, CAltitude::MeanSeaLevel, CLengthUnit::nullUnit());

9
src/blackmisc/aviation/altitude.h
View File

@@ -67,9 +67,9 @@ namespace BlackMisc
*/
enum ReferenceDatum
{
MeanSeaLevel = 0, //!< MSL
AboveGround, //!< AGL
FlightLevel //!< Flight level
MeanSeaLevel = 0, //!< MSL
AboveGround, //!< AGL
FlightLevel //!< Flight level
};
//! Altitude type
@@ -185,6 +185,9 @@ namespace BlackMisc
//! \copydoc BlackMisc::Mixin::Icon::toIcon
BlackMisc::CIcon toIcon() const;
//! \copydoc PhysicalQuantities::CPhysicalQuantity::compare
int compare(const CAltitude &otherAltitude) const;
//! Null altitude (MSL)
static const CAltitude &null();