Changeset 208 in pacpusframework for trunk/include/Pacpus/PacpusTools/geodesie.h

Timestamp:

11/06/13 11:22:15 (11 years ago)

Author:

Marek Kurdej

Message:

Minor: Geodesie.

File:

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

trunk/include/Pacpus/PacpusTools/geodesie.h

@@ -4 +4 @@
 // %}
 /// @file
+/// @author  Marek Kurdej <firstname.surname@utc.fr>
 /// @author  Jean Laneurit <firstname.surname@utc.fr>
 /// @date    April, 2010
@@ -17 +18 @@
 #include "PacpusToolsConfig.h"
 
-//#include <boost/math/constants/constants.hpp>
+#include <boost/math/constants/constants.hpp>
 #include <cmath>
 #include <iostream>
@@ -25 +26 @@
 #include <QVector3D>
 
-namespace Geodesie {
-
-#ifndef M_PI
-#   define M_PI 3.14159265358979323846
-#endif
-#ifndef M_PI_2
-#   define M_PI_2 1.57079632679489661923
-#endif
-#ifndef M_PI_4
-#   define M_PI_4 0.78539816339744830962
-#endif
+namespace Geodesie
+{
 
 /// 9x9 matrix ???
@@ -106 +98 @@
 inline double Deg2Rad(double deg)
 {
-    return deg * M_PI / 180.0;
+    using namespace ::boost::math::constants;
+    return deg * pi<double>() / 180.0;
 }
 
 inline double Rad2Deg(double rad)
 {
-    return rad * 180.0 / M_PI;
+    using namespace ::boost::math::constants;
+    return rad * 180.0 / pi<double>();
 }