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

Numeric double cast/comparison

Browse Source
This commit is contained in:
Klaus Basan
2018-08-16 02:49:33 +02:00
parent 3a09749103
commit 660a1adb71
4 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,7 +44,7 @@ namespace BlackMisc
const QVector3D v1 = coordinate1.normalVector();
const QVector3D v2 = coordinate2.normalVector();
const float d = earthRadiusMeters * std::atan2(QVector3D::crossProduct(v1, v2).length(), QVector3D::dotProduct(v1, v2));
return { d, CLengthUnit::m() };
return { static_cast<double>(d), CLengthUnit::m() };
}
CAngle calculateBearing(const ICoordinateGeodetic &coordinate1, const ICoordinateGeodetic &coordinate2)
@@ -56,17 +56,17 @@ namespace BlackMisc
const float sinTheta = std::copysign(cross.length(), QVector3D::dotProduct(cross, coordinate1.normalVector()));
const float cosTheta = QVector3D::dotProduct(c1, c2);
const float theta = std::atan2(sinTheta, cosTheta);
return { theta, CAngleUnit::rad() };
return { static_cast<double>(theta), CAngleUnit::rad() };
}
double calculateEuclideanDistance(const ICoordinateGeodetic &coordinate1, const ICoordinateGeodetic &coordinate2)
{
return coordinate1.normalVector().distanceToPoint(coordinate2.normalVector());
return static_cast<double>(coordinate1.normalVector().distanceToPoint(coordinate2.normalVector()));
}
double calculateEuclideanDistanceSquared(const ICoordinateGeodetic &coordinate1, const ICoordinateGeodetic &coordinate2)
{
return (coordinate1.normalVector() - coordinate2.normalVector()).lengthSquared();
return static_cast<double>((coordinate1.normalVector() - coordinate2.normalVector()).lengthSquared());
}
bool ICoordinateGeodetic::equalNormalVectorDouble(const std::array<double, 3> &otherVector) const