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

Ref T268, elevation handling improvements

Browse Source 
* utility functions
* made storeAircraftSituation virtual and return Aviation::CAircraftSituation
* coordinate toQString in deg/rad
This commit is contained in:
Klaus Basan
2018-07-11 02:34:58 +02:00
parent 226abd0d38
commit a5acd0a1ec
13 changed files with 71 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/blackmisc/geo/coordinategeodetic.cpp
View File

@@ -27,8 +27,7 @@ namespace BlackMisc
{
QString CCoordinateGeodetic::convertToQString(bool i18n) const
{
static const QString s = "Geodetic: {%1, %2, %3}";
return s.arg(this->latitude().valueRoundedWithUnit(6, i18n), this->longitude().valueRoundedWithUnit(6, i18n), m_geodeticHeight.valueRoundedWithUnit(6, i18n));
return ICoordinateGeodetic::convertToQString(i18n);
}
CCoordinateGeodetic CCoordinateGeodetic::fromWgs84(const QString &latitudeWgs84, const QString &longitudeWgs84, const CAltitude &geodeticHeight)
@@ -158,10 +157,14 @@ namespace BlackMisc
QString ICoordinateGeodetic::convertToQString(bool i18n) const
{
Q_UNUSED(i18n);
return this->latitudeAsString() % QLatin1Char(' ') %
QStringLiteral(" | ") % this->longitudeAsString() % QLatin1Char(' ') %
QStringLiteral(" | ") % this->geodeticHeightAsString();
static const QString s = "Geodetic: {%1/%2, %3/%4, %5}";
const CLatitude lat = this->latitude();
const CLongitude lng = this->longitude();
return s.arg(lat.valueRoundedWithUnit(CAngleUnit::deg(), 6, i18n),
lat.valueRoundedWithUnit(CAngleUnit::rad(), 6, i18n),
lng.valueRoundedWithUnit(CAngleUnit::deg(), 6, i18n),
lng.valueRoundedWithUnit(CAngleUnit::rad(), 6, i18n),
this->geodeticHeight().valueRoundedWithUnit(CLengthUnit::ft(), 2, i18n));
}
CVariant CCoordinateGeodetic::propertyByIndex(const BlackMisc::CPropertyIndex &index) const

12
src/blackmisc/geo/elevationplane.cpp
View File

@@ -21,15 +21,9 @@ namespace BlackMisc
{
QString CElevationPlane::convertToQString(bool i18n) const
{
static const QString s = "Geodetic: {%1/%2, %3/%4, %5} radius: %6";
const CLatitude lat = this->latitude();
const CLongitude lng = this->longitude();
return s.arg(lat.valueRoundedWithUnit(CAngleUnit::deg(), 6, i18n),
lat.valueRoundedWithUnit(CAngleUnit::rad(), 6, i18n),
lng.valueRoundedWithUnit(CAngleUnit::deg(), 6, i18n),
lng.valueRoundedWithUnit(CAngleUnit::rad(), 6, i18n),
this->geodeticHeight().valueRoundedWithUnit(CLengthUnit::ft(), 6, i18n),
m_radius.valueRoundedWithUnit(2, i18n));
static const QString s = "%1 radius: %2";
const QString coordinate = CCoordinateGeodetic::toQString(i18n);
return s.arg(coordinate, m_radius.valueRoundedWithUnit(2, i18n));
}
CElevationPlane::CElevationPlane(const ICoordinateGeodetic &coordinate, const ICoordinateGeodetic &rangeCoordinate) :