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

refs #484 Revise CCoordinateGeodetic implementation to use n-vectors.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-10-19 23:24:33 +01:00
parent 7483195b47
commit bc9ff9f6b2
7 changed files with 139 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,10 +77,10 @@ namespace BlackMisc
void setPosition(const BlackMisc::Geo::CCoordinateGeodetic &position) { this->m_position = position; }
//! \copydoc ICoordinateGeodetic::latitude()
virtual const BlackMisc::Geo::CLatitude &latitude() const override { return this->m_position.latitude(); }
virtual BlackMisc::Geo::CLatitude latitude() const override { return this->m_position.latitude(); }
//! \copydoc ICoordinateGeodetic::longitude()
virtual const BlackMisc::Geo::CLongitude &longitude() const override { return this->m_position.longitude(); }
virtual BlackMisc::Geo::CLongitude longitude() const override { return this->m_position.longitude(); }
//! Guess if aircraft is "on ground"
virtual bool isOnGroundGuessed() const;
@@ -89,6 +89,9 @@ namespace BlackMisc
//! \remarks this should be used for elevation as depicted here: http://en.wikipedia.org/wiki/Altitude#mediaviewer/File:Vertical_distances.svg
const BlackMisc::PhysicalQuantities::CLength &geodeticHeight() const override { return this->m_position.geodeticHeight(); }
//! \copydoc ICoordinateGeodetic::normalVector
virtual QVector3D normalVector() const override { return this->m_position.normalVector(); }
//! Elevation
//! \sa geodeticHeight
const BlackMisc::PhysicalQuantities::CLength getElevation() const { return this->geodeticHeight(); }

7
src/blackmisc/aviation/airport.h
View File

@@ -85,17 +85,20 @@ namespace BlackMisc
bool hasValidIcaoCode() const { return !this->getIcao().isEmpty(); }
//! \copydoc ICoordinateGeodetic::latitude
virtual const BlackMisc::Geo::CLatitude &latitude() const override
virtual BlackMisc::Geo::CLatitude latitude() const override
{
return this->getPosition().latitude();
}
//! \copydoc ICoordinateGeodetic::longitude
virtual const BlackMisc::Geo::CLongitude &longitude() const override
virtual BlackMisc::Geo::CLongitude longitude() const override
{
return this->getPosition().longitude();
}
//! \copydoc ICoordinateGeodetic::normalVector
virtual QVector3D normalVector() const override { return this->getPosition().normalVector(); }
//! \copydoc CValueObject::propertyByIndex
CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;

9
src/blackmisc/aviation/atcstation.cpp
View File

@@ -318,12 +318,12 @@ namespace BlackMisc
}
}
const CLatitude &CAtcStation::latitude() const
CLatitude CAtcStation::latitude() const
{
return this->getPosition().latitude();
}
const CLongitude &CAtcStation::longitude() const
CLongitude CAtcStation::longitude() const
{
return this->getPosition().longitude();
}
@@ -333,6 +333,11 @@ namespace BlackMisc
return this->m_position.geodeticHeight();
}
QVector3D CAtcStation::normalVector() const
{
return this->m_position.normalVector();
}
CVariant CAtcStation::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
{
if (index.isMyself()) { return CVariant::from(*this); }

7
src/blackmisc/aviation/atcstation.h
View File

@@ -221,15 +221,18 @@ namespace BlackMisc
void setBookedUntilUtc(const QDateTime &until) { this->m_bookedUntilUtc = until; }
//! \copydoc ICoordinateGeodetic::latitude
virtual const BlackMisc::Geo::CLatitude &latitude() const override;
virtual BlackMisc::Geo::CLatitude latitude() const override;
//! \copydoc ICoordinateGeodetic::longitude
virtual const BlackMisc::Geo::CLongitude &longitude() const override;
virtual BlackMisc::Geo::CLongitude longitude() const override;
//! \copydoc ICoordinateGeodetic::geodeticHeight
//! \remarks this should be used for elevation as depicted here: http://en.wikipedia.org/wiki/Altitude#mediaviewer/File:Vertical_distances.svg
const BlackMisc::PhysicalQuantities::CLength &geodeticHeight() const override;
//! \copydoc ICoordinateGeodetic::normalVector
virtual QVector3D normalVector() const override;
//! \copydoc CValueObject::propertyByIndex
CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;