Changeset 208 in pacpusframework

Timestamp:

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

Author:

Marek Kurdej

Message:

Minor: Geodesie.

Location:

trunk

Files:

• include/Pacpus/PacpusTools/geodesie.h (modified) (4 diffs)
• src/PacpusTools/src/geodesie.cpp (modified) (12 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>();
 }
 

trunk/src/PacpusTools/src/geodesie.cpp

@@ -2 +2 @@
 // This file is part of the PACPUS framework distributed under the
 // CECILL-C License, Version 1.0.
+/// @author  Marek Kurdej <firstname.surname@utc.fr>
 /// @author  Jean Laneurit <firstname.surname@utc.fr>
 /// @date    April, 2010
@@ -10 +11 @@
 #include <fstream>
 
-//using boost::math::constants::pi;
+using boost::math::constants::pi;
+using boost::math::constants::half_pi;
 
 #ifdef _MSC_VER
@@ -16 +18 @@
 #endif //_MSC_VER
 
-namespace Geodesie {
-/// ////////////////////////////////////////////////////////////////////
-Matrice::Matrice(const Matrice & A) {
+namespace Geodesie
+{
+
+/// ////////////////////////////////////////////////////////////////////
+Matrice::Matrice(const Matrice & A)
+{
     c0_l0=A.c0_l0;c1_l0=A.c1_l0;c2_l0=A.c2_l0;
     c0_l1=A.c0_l1;c1_l1=A.c1_l1;c2_l1=A.c2_l1;
     c0_l2=A.c0_l2;c1_l2=A.c1_l2;c2_l2=A.c2_l2;
 }
-/// ////////////////////////////////////////////////////////////////////
-Matrice::Matrice() {
+
+/// ////////////////////////////////////////////////////////////////////
+Matrice::Matrice()
+{
     c0_l0=0.0;c1_l0=0.0;c2_l0=0.0;
     c0_l1=0.0;c1_l1=0.0;c2_l1=0.0;
     c0_l2=0.0;c1_l2=0.0;c2_l2=0.0;
 }
-/// ////////////////////////////////////////////////////////////////////
-void Matrice::Apply(double v0,double v1,double v2, double& Mv0,double& Mv1,double& Mv2) {
+
+/// ////////////////////////////////////////////////////////////////////
+void Matrice::Apply(double v0,double v1,double v2, double& Mv0,double& Mv1,double& Mv2)
+{
     Mv0 = c0_l0*v0 + c1_l0*v1 + c2_l0*v2;
     Mv1 = c0_l1*v0 + c1_l1*v1 + c2_l1*v2;
     Mv2 = c0_l2*v0 + c1_l2*v1 + c2_l2*v2;
 }
-/// ////////////////////////////////////////////////////////////////////
-Matrice ProdMat(const Matrice A, const Matrice B) {
+
+/// ////////////////////////////////////////////////////////////////////
+Matrice ProdMat(const Matrice A, const Matrice B)
+{
     Matrice out;
 
@@ -54 +65 @@
 
 /// ////////////////////////////////////////////////////////////////////
-Matrice TransMat(const Matrice A) {
+Matrice TransMat(const Matrice A)
+{
     Matrice out;
     out.c0_l0=A.c0_l0 ; out.c1_l0 = A.c0_l1 ; out.c2_l0 = A.c0_l2 ; 
@@ -112 +124 @@
     return true;
 }
-/// ////////////////////////////////////////////////////////////////////
-double Raf98::LitGrille(unsigned int c,unsigned int l) const{
+
+/// ////////////////////////////////////////////////////////////////////
+double Raf98::LitGrille(unsigned int c,unsigned int l) const
+{
     const unsigned int w=421;
     //    const unsigned int h=381;
     return m_dvalues.at(c+l*w);
 }
-/// ////////////////////////////////////////////////////////////////////
-bool Raf98::Load(const std::string & sin) {
-    std::ifstream in(sin.c_str());
+
+/// ////////////////////////////////////////////////////////////////////
+bool Raf98::Load(const std::string & s)
+{
+    std::ifstream in(s.c_str());
     unsigned int w = 421;
     unsigned int h = 381;
@@ -161 +177 @@
 /// ////////////////////////////////////////////////////////////////////
 //ALGO0001
-double Geodesie::LatitueIsometrique(double latitude,double e) {
-    double li;
-    li = log(tan(M_PI_4 + latitude/2.)) + e*log( (1-e*sin(latitude))/(1+e*sin(latitude)) )/2;
+double Geodesie::LatitueIsometrique(double latitude, double e)
+{
+    using ::std::log;
+    using ::std::sin;
+    using ::std::tan;
+
+    double li = log(tan(pi<double>() / 4. + latitude/2.)) + e*log( (1-e*sin(latitude))/(1+e*sin(latitude)) )/2;
     return li;
 }
@@ -169 +189 @@
 /// ////////////////////////////////////////////////////////////////////
 //ALGO0002
-double Geodesie::LatitueIsometrique2Lat(double latitude_iso,double e,double epsilon) {
-    double latitude_i=2*atan(exp(latitude_iso)) - M_PI_2;
-    double latitude_ip1=latitude_i+epsilon*2;
-    while (fabs(latitude_i-latitude_ip1)>epsilon) {
-        latitude_i=latitude_ip1;
-        latitude_ip1=2*atan(
+double Geodesie::LatitueIsometrique2Lat(double latitude_iso,double e,double epsilon)
+{
+    using ::std::atan;
+    using ::std::exp;
+    using ::std::abs;
+    using ::std::log;
+    using ::std::sin;
+
+    double latitude_i = 2 * atan(exp(latitude_iso)) - half_pi<double>();
+    double latitude_ip1 = latitude_i + epsilon * 2;
+    while (abs(latitude_i-latitude_ip1) > epsilon) {
+        latitude_i = latitude_ip1;
+        latitude_ip1 = 2 * atan(
                     exp(e*0.5*
                         log(
@@ -181 +208 @@
                         )
                     *exp(latitude_iso)
-                    ) - M_PI_2;
+                    ) - half_pi<double>();
     }
     return latitude_ip1;
@@ -222 +249 @@
 
 ////////////////////////////////////////////////////////////////////
-void Geodesie::Geographique_2_Lambert93(const Raf98& raf98,double lambda,double phi,double he,Matrice in,double& E,double& N,double& h,Matrice& out) {
+void Geodesie::Geographique_2_Lambert93(const Raf98& raf98,double lambda,double phi,double he,Matrice in,double& E,double& N,double& h,Matrice& out)
+{
     Matrice passage;
     double conv=Geodesie::ConvMerApp(lambda);
@@ -263 +291 @@
     h=he-diff_h;
 }
-/**
-    Converts Lambert93 coordinates (East, North, Height) into geographical coordinates in radians (Longitude = Rad2Deg(lambda), Latitude = Rad2Deg(phi), Height)
-*/
+
+/// Converts Lambert93 coordinates (East, North, Height) into geographical coordinates in radians (Longitude = Rad2Deg(lambda), Latitude = Rad2Deg(phi), Height)
 void Geodesie::Lambert93_2_Geographique(const Raf98& raf98,double E,double N,double h,double& lambda,double& phi,double& he) {
     Geodesie::Proj2GeoLambert(
@@ -278 +305 @@
     he=h+diff_h;
 }
+
 ////////////////////////////////////////////////////////////////////////
 void Geodesie::Lambert93_2_Geographique(const Raf98& raf98,double E,double N,double h,Matrice in,double& lambda,double& phi,double& he,Matrice& out) {
@@ -348 +376 @@
 }
 
-QMatrix4x4 Geodesie::yprenuToMatrix(QVector3D angle, QVector3D position) {
-
+QMatrix4x4 Geodesie::yprenuToMatrix(QVector3D angle, QVector3D position)
+{
     float c1 = cos(angle.x());
     float c2 = cos(angle.y());