Changeset 209 in pacpusframework for trunk

Timestamp:

Nov 6, 2013, 11:23:49 AM (11 years ago)

Author:

Marek Kurdej

Message:

Minor: Geodesie -> Geodesy or Geodesie.

Location:

trunk

Files:

• include/Pacpus/PacpusTools/geodesie.h (modified) (2 diffs)
• src/PacpusTools/src/geodesie.cpp (modified) (17 diffs)

trunk/include/Pacpus/PacpusTools/geodesie.h

@@ -26 +26 @@
 #include <QVector3D>
 
-namespace Geodesie
+namespace Geodesy
 {
 
@@ -213 +213 @@
 PACPUSTOOLS_API QMatrix4x4 yprenuToMatrix(QVector3D angle, QVector3D position);
 
+} // namespace Geodesy
+
+namespace Geodesie
+{
+    using namespace Geodesy;
 } // namespace Geodesie
 

trunk/src/PacpusTools/src/geodesie.cpp

@@ -18 +18 @@
 #endif //_MSC_VER
 
-namespace Geodesie
+namespace Geodesy
 {
 
@@ -170 +170 @@
 }
 
-} // namespace Geodesie
+} // namespace Geodesy
 
 /// ////////////////////////////////////////////////////////////////////
@@ -177 +177 @@
 /// ////////////////////////////////////////////////////////////////////
 //ALGO0001
-double Geodesie::LatitueIsometrique(double latitude, double e)
+double Geodesy::LatitueIsometrique(double latitude, double e)
 {
     using ::std::log;
@@ -189 +189 @@
 /// ////////////////////////////////////////////////////////////////////
 //ALGO0002
-double Geodesie::LatitueIsometrique2Lat(double latitude_iso,double e,double epsilon)
+double Geodesy::LatitueIsometrique2Lat(double latitude_iso,double e,double epsilon)
 {
     using ::std::atan;
@@ -213 +213 @@
 }
 /// ////////////////////////////////////////////////////////////////////
-void Geodesie::Geo2ProjLambert(
+void Geodesy::Geo2ProjLambert(
     double lambda,double phi,
     double n, double c,double e,
@@ -225 +225 @@
 /// ////////////////////////////////////////////////////////////////////
 //ALGO0004
-void Geodesie::Proj2GeoLambert(
+void Geodesy::Proj2GeoLambert(
     double X,double Y,
     double n, double c,double e,
@@ -241 +241 @@
 }
 /// ////////////////////////////////////////////////////////////////////
-double Geodesie::ConvMerApp(double longitude) {
+double Geodesy::ConvMerApp(double longitude) {
     double phi0_Lambert93 = Deg2Rad(46.5);
     double lambda0_Lambert93 = Deg2Rad(3.0);
@@ -249 +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 Geodesy::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);
+    double conv=Geodesy::ConvMerApp(lambda);
     double c_=cos(conv);
     double s_=sin(conv);
@@ -273 +273 @@
     h=he-diff_h;
     
-    Geodesie::Geo2ProjLambert(
+    Geodesy::Geo2ProjLambert(
                 lambda,phi,
                 n_Lambert93,c_Lambert93,e_Lambert93,
@@ -280 +280 @@
 }
 ////////////////////////////////////////////////////////////////////////
-void Geodesie::Geographique_2_Lambert93(const Raf98& raf98,double lambda,double phi,double he,double& E,double& N,double& h) {
-    Geodesie::Geo2ProjLambert(
+void Geodesy::Geographique_2_Lambert93(const Raf98& raf98,double lambda,double phi,double he,double& E,double& N,double& h) {
+    Geodesy::Geo2ProjLambert(
                 lambda,phi,
                 n_Lambert93,c_Lambert93,e_Lambert93,
@@ -293 +293 @@
 
 /// 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(
+void Geodesy::Lambert93_2_Geographique(const Raf98& raf98,double E,double N,double h,double& lambda,double& phi,double& he) {
+    Geodesy::Proj2GeoLambert(
                 E,N,
                 n_Lambert93,c_Lambert93,e_Lambert93,
@@ -307 +307 @@
 
 ////////////////////////////////////////////////////////////////////////
-void Geodesie::Lambert93_2_Geographique(const Raf98& raf98,double E,double N,double h,Matrice in,double& lambda,double& phi,double& he,Matrice& out) {
-    Geodesie::Proj2GeoLambert(
+void Geodesy::Lambert93_2_Geographique(const Raf98& raf98,double E,double N,double h,Matrice in,double& lambda,double& phi,double& he,Matrice& out) {
+    Geodesy::Proj2GeoLambert(
                 E,N,
                 n_Lambert93,c_Lambert93,e_Lambert93,
@@ -316 +316 @@
 
     Matrice passage;
-    double conv=Geodesie::ConvMerApp(lambda);
+    double conv=Geodesy::ConvMerApp(lambda);
     double c_=cos(conv);
     double s_=sin(conv);
@@ -340 +340 @@
 
 ////////////////////////////////////////////////////////////////////////
-void Geodesie::Geographique_2_ECEF(double longitude,double latitude,double he,double& x,double& y,double& z) {
+void Geodesy::Geographique_2_ECEF(double longitude,double latitude,double he,double& x,double& y,double& z) {
     const double n = GRS_a / sqrt(1.0 - pow(GRS_e,2) * pow(sin(latitude),2));
     x = (n + he) * cos(latitude) * cos(longitude);
@@ -348 +348 @@
 
 ////////////////////////////////////////////////////////////////////////
-void Geodesie::ECEF_2_ENU(double x,double y,double z,double& e,double& n,double& u,double lon0,double lat0,double he0) {
+void Geodesy::ECEF_2_ENU(double x,double y,double z,double& e,double& n,double& u,double lon0,double lat0,double he0) {
     double slat = std::sin(lat0);
     double clat = std::cos(lat0);
@@ -354 +354 @@
     double clon = std::cos(lon0);
 
-    Geodesie::Matrice C;
+    Geodesy::Matrice C;
     C.c0_l0 = -slon;
     C.c1_l0 = clon;
@@ -376 +376 @@
 }
 
-QMatrix4x4 Geodesie::yprenuToMatrix(QVector3D angle, QVector3D position)
+QMatrix4x4 Geodesy::yprenuToMatrix(QVector3D angle, QVector3D position)
 {
     float c1 = cos(angle.x());