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

Restored constexpr initialization and return-by-value of CMeasurementUnit constants

Browse Source 
that were removed by commit 787b54108e.

For rationale, see the commits fef2bc528e, c8d78ada65, 07ec7e6bc1 where these
were originally introduced.
This commit is contained in:
Mat Sutcliffe
2019-02-24 12:34:15 +00:00
parent 30c0054f57
commit 980e1d7b80
6 changed files with 124 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackmisc/aviation/aircraftsituation.cpp
View File

@@ -906,7 +906,7 @@ namespace BlackMisc
m_heading = heading.normalizedToPlusMinus180Degrees();
}
const CLengthUnit &CAircraftSituation::getAltitudeOrDefaultUnit() const
CLengthUnit CAircraftSituation::getAltitudeOrDefaultUnit() const
{
if (this->getAltitude().isNull()) { return CAltitude::defaultUnit(); }
return m_position.geodeticHeight().getUnit();

4
src/blackmisc/aviation/aircraftsituation.h
View File

@@ -367,10 +367,10 @@ namespace BlackMisc
const CAltitude &getAltitude() const { return m_position.geodeticHeight(); }
//! Get altitude unit
const PhysicalQuantities::CLengthUnit &getAltitudeUnit() const { return m_position.geodeticHeight().getUnit(); }
PhysicalQuantities::CLengthUnit getAltitudeUnit() const { return m_position.geodeticHeight().getUnit(); }
//! Get altitude unit
const PhysicalQuantities::CLengthUnit &getAltitudeOrDefaultUnit() const;
PhysicalQuantities::CLengthUnit getAltitudeOrDefaultUnit() const;
//! Get altitude under consideration of ground elevation and ground flag
//! \remark with dragToGround it will also compensate overflows, otherwise only underflow

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

@@ -394,7 +394,7 @@ namespace BlackMisc
return null;
}
const CLengthUnit &CAltitude::defaultUnit()
CLengthUnit CAltitude::defaultUnit()
{
return CLengthUnit::ft();
}

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

@@ -198,7 +198,7 @@ namespace BlackMisc
//! Default unit for calculations
//! \remark using this is optional and will simplify debugging and calculations
static const PhysicalQuantities::CLengthUnit &defaultUnit();
static PhysicalQuantities::CLengthUnit defaultUnit();
//! Standard pressure 1013.25mbar/hPa
static const PhysicalQuantities::CPressure &standardISASeaLevelPressure();