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

refs #865, hints get ground elevation from provider or from set value

Browse Source 
* using CAltitude for elevation provider
* null() for CAltitude
* formatting of members
* fixme in fs9 client
This commit is contained in:
Klaus Basan
2017-01-22 00:18:09 +01:00
committed by Mathew Sutcliffe
parent 0a99c82ddc
commit 38585d10b2
6 changed files with 45 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/blackmisc/simulation/interpolationhints.cpp
View File

@@ -10,6 +10,7 @@
#include "interpolationhints.h"
#include "blackmisc/aviation/aircraftsituation.h"
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Geo;
using namespace BlackMisc::PhysicalQuantities;
@@ -22,6 +23,13 @@ namespace BlackMisc
CInterpolationHints::CInterpolationHints(bool isVtolAircraft) : m_isVtol(isVtolAircraft)
{ }
CAltitude CInterpolationHints::getGroundElevation(const Aviation::CAircraftSituation &situation) const
{
if (m_elevationProvider) { return m_elevationProvider(situation); }
if (m_elevation.isNull() || !m_elevation.isWithinRange(situation)) { return CAltitude::null(); }
return m_elevation.geodeticHeight();
}
void CInterpolationHints::resetElevation()
{
m_elevation = CElevationPlane();
@@ -33,6 +41,12 @@ namespace BlackMisc
return m_elevation.isWithinRange(coordinate);
}
void CInterpolationHints::setAircraftParts(const CAircraftParts &parts, bool hasParts)
{
m_hasParts = hasParts;
m_aircraftParts = parts;
}
CVariant CInterpolationHints::propertyByIndex(const CPropertyIndex &index) const
{
if (index.isMyself()) { return CVariant::from(*this); }

22
src/blackmisc/simulation/interpolationhints.h
View File

@@ -20,7 +20,6 @@
namespace BlackMisc
{
namespace Aviation { class CAircraftSituation; }
namespace Simulation
{
//! Hints for interpolator such as ground elevation
@@ -45,6 +44,9 @@ namespace BlackMisc
//! Get elevation
const BlackMisc::Geo::CElevationPlane &getElevation() const { return m_elevation;}
//! Get elevation from CInterpolationHints::getElevationProvider or CInterpolationHints::getElevation
Aviation::CAltitude getGroundElevation(const BlackMisc::Aviation::CAircraftSituation &situation) const;
//! Set elevation
void setElevation(const BlackMisc::Geo::CElevationPlane &elevation) { m_elevation = elevation; }
@@ -69,16 +71,18 @@ namespace BlackMisc
//! Has valid aircraft parts?
bool hasAircraftParts() const { return m_hasParts; }
//! Aircraft parts
//! Aircraft parts required for interpolation
BlackMisc::Aviation::CAircraftParts getAircraftParts() const { return m_aircraftParts; }
//! Set aircraft parts
void setAircraftParts(const BlackMisc::Aviation::CAircraftParts &parts) { m_hasParts = true; m_aircraftParts = parts; }
//! Set aircraft parts required for interpolation if any
//! \remark when used to reset value (default object) use hasParts false. Needed as there is no null parts object
void setAircraftParts(const BlackMisc::Aviation::CAircraftParts &parts, bool hasParts = true);
//! Function object that can obtain ground elevation
using ElevationProvider = std::function<BlackMisc::PhysicalQuantities::CLength(const BlackMisc::Aviation::CAircraftSituation &)>;
using ElevationProvider = std::function<BlackMisc::Aviation::CAltitude(const BlackMisc::Aviation::CAircraftSituation &)>;
//! Function object that can obtain ground elevation
//! \remark either a provider or a value set can be used
const ElevationProvider &getElevationProvider() const { return m_elevationProvider; }
//! Set function object that can obtain ground elevation
@@ -97,12 +101,12 @@ namespace BlackMisc
QString debugInfo(const BlackMisc::Geo::CElevationPlane &deltaElevation) const;
private:
bool m_isVtol = false; //!< VTOL aircraft?
BlackMisc::Geo::CElevationPlane m_elevation; //!< aircraft's elevation if available
BlackMisc::PhysicalQuantities::CLength m_cgAboveGround { 0, nullptr }; //!< center of gravity above ground
bool m_isVtol = false; //!< VTOL aircraft?
bool m_hasParts = false; //!< Has valid aircraft parts?
BlackMisc::Aviation::CAircraftParts m_aircraftParts; //!< Aircraft parts
ElevationProvider m_elevationProvider; //!< Provider of ground elevation (lazy computation)
BlackMisc::Geo::CElevationPlane m_elevation; //!< aircraft's elevation if available
ElevationProvider m_elevationProvider; //!< Provider of ground elevation (lazy computation)
BlackMisc::PhysicalQuantities::CLength m_cgAboveGround { 0, nullptr }; //!< center of gravity above ground
BLACK_METACLASS(
CInterpolationHints,