Changeset 211 in pacpusframework for trunk/include/Pacpus/PacpusTools

Timestamp:

Nov 6, 2013, 11:38:40 AM (11 years ago)

Author:

Marek Kurdej

Message:

Geodesie: minor fixes.

File:

• trunk/include/Pacpus/PacpusTools/geodesie.h (modified) (9 diffs)

trunk/include/Pacpus/PacpusTools/geodesie.h

@@ -25 +25 @@
 #include <vector>
 
-#include <QMatrix4x4>
-#include <QVector3D>
+//#include <QMatrix4x4>
+//#include <QVector3D>
 
 namespace Geodesy
 {
 
-/// 9x9 matrix ???
+/// 3x3 matrix ???
 ///
 /// @todo Documentation
@@ -83 +83 @@
 
     /// @todo Documentation
-    /// @param s filepath
-    bool Load(const std::string& s);
+    /// @param filepath Path to the input file with RAF98 data.
+    bool Load(const std::string& filepath);
 
     /// @todo Documentation
@@ -102 +102 @@
 inline double Deg2Rad(double deg)
 {
-    using namespace ::boost::math::constants;
+    using ::boost::math::constants::pi;
     return deg * pi<double>() / 180.0;
 }
@@ -108 +108 @@
 inline double Rad2Deg(double rad)
 {
-    using namespace ::boost::math::constants;
+    using ::boost::math::constants::pi;
     return rad * 180.0 / pi<double>();
 }
@@ -175 +175 @@
 PACPUSTOOLS_API double ConvMerApp(double longitude);
 
-/**
-Converts Cartesian (x, y) coordinates to polar coordinates (r, theta)
-*/
+/// Converts Cartesian (x, y) coordinates to polar coordinates (r, theta)
 template <typename _T1, typename _T2>
 void cartesianToPolar(const _T1 x, const _T1 y, _T2& r, _T2& theta)
@@ -185 +183 @@
 }
 
-/**
-Converts polar coordinates (r, theta) to Cartesian (x, y) coordinates
-*/
+/// Converts polar coordinates (r, theta) to Cartesian (x, y) coordinates
 template <typename _T1, typename _T2>
 void polarToCartesian(const _T1 r, const _T1 theta, _T2& x, _T2& y)
@@ -195 +191 @@
 }
 
-/**
-Converts Cartesian (x, y, z) coordinates to spherical coordinates (r, theta, phi)
-Angles expressed in radians.
-*/
+/// Converts Cartesian (x, y, z) coordinates to spherical coordinates (r, theta, phi)
+/// Angles expressed in radians.
 template <typename _T1, typename _T2>
 void cartesianToSpherical(const _T1 x, const _T1 y, const _T1 z, _T2& r, _T2& theta, _T2& phi)
@@ -207 +201 @@
 }
 
-/**
-Converts spherical coordinates (r, theta, phi) to Cartesian (x, y, z) coordinates.
-Angles expressed in radians.
-*/
+/// Converts spherical coordinates (r, theta, phi) to Cartesian (x, y, z) coordinates.
+/// Angles expressed in radians.
 template <typename _T1, typename _T2>
 void sphericalToCartesian(const _T1 r, const _T1 theta, const _T1 phi, _T2& x, _T2& y, _T2& z)
@@ -219 +211 @@
 }
 
-PACPUSTOOLS_API QMatrix4x4 yprenuToMatrix(QVector3D angle, QVector3D position);
+//PACPUSTOOLS_API QMatrix4x4 yprenuToMatrix(QVector3D angle, QVector3D position);
 
 } // namespace Geodesy