Changeset 209 in pacpusframework


Ignore:
Timestamp:
Nov 6, 2013, 11:23:49 AM (11 years ago)
Author:
Marek Kurdej
Message:

Minor: Geodesie -> Geodesy or Geodesie.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/Pacpus/PacpusTools/geodesie.h

    r208 r209  
    2626#include <QVector3D>
    2727
    28 namespace Geodesie
     28namespace Geodesy
    2929{
    3030
     
    213213PACPUSTOOLS_API QMatrix4x4 yprenuToMatrix(QVector3D angle, QVector3D position);
    214214
     215} // namespace Geodesy
     216
     217namespace Geodesie
     218{
     219    using namespace Geodesy;
    215220} // namespace Geodesie
    216221
  • trunk/src/PacpusTools/src/geodesie.cpp

    r208 r209  
    1818#endif //_MSC_VER
    1919
    20 namespace Geodesie
     20namespace Geodesy
    2121{
    2222
     
    170170}
    171171
    172 } // namespace Geodesie
     172} // namespace Geodesy
    173173
    174174/// ////////////////////////////////////////////////////////////////////
     
    177177/// ////////////////////////////////////////////////////////////////////
    178178//ALGO0001
    179 double Geodesie::LatitueIsometrique(double latitude, double e)
     179double Geodesy::LatitueIsometrique(double latitude, double e)
    180180{
    181181    using ::std::log;
     
    189189/// ////////////////////////////////////////////////////////////////////
    190190//ALGO0002
    191 double Geodesie::LatitueIsometrique2Lat(double latitude_iso,double e,double epsilon)
     191double Geodesy::LatitueIsometrique2Lat(double latitude_iso,double e,double epsilon)
    192192{
    193193    using ::std::atan;
     
    213213}
    214214/// ////////////////////////////////////////////////////////////////////
    215 void Geodesie::Geo2ProjLambert(
     215void Geodesy::Geo2ProjLambert(
    216216    double lambda,double phi,
    217217    double n, double c,double e,
     
    225225/// ////////////////////////////////////////////////////////////////////
    226226//ALGO0004
    227 void Geodesie::Proj2GeoLambert(
     227void Geodesy::Proj2GeoLambert(
    228228    double X,double Y,
    229229    double n, double c,double e,
     
    241241}
    242242/// ////////////////////////////////////////////////////////////////////
    243 double Geodesie::ConvMerApp(double longitude) {
     243double Geodesy::ConvMerApp(double longitude) {
    244244    double phi0_Lambert93 = Deg2Rad(46.5);
    245245    double lambda0_Lambert93 = Deg2Rad(3.0);
     
    249249
    250250////////////////////////////////////////////////////////////////////
    251 void Geodesie::Geographique_2_Lambert93(const Raf98& raf98,double lambda,double phi,double he,Matrice in,double& E,double& N,double& h,Matrice& out)
     251void Geodesy::Geographique_2_Lambert93(const Raf98& raf98,double lambda,double phi,double he,Matrice in,double& E,double& N,double& h,Matrice& out)
    252252{
    253253    Matrice passage;
    254     double conv=Geodesie::ConvMerApp(lambda);
     254    double conv=Geodesy::ConvMerApp(lambda);
    255255    double c_=cos(conv);
    256256    double s_=sin(conv);
     
    273273    h=he-diff_h;
    274274   
    275     Geodesie::Geo2ProjLambert(
     275    Geodesy::Geo2ProjLambert(
    276276                lambda,phi,
    277277                n_Lambert93,c_Lambert93,e_Lambert93,
     
    280280}
    281281////////////////////////////////////////////////////////////////////////
    282 void Geodesie::Geographique_2_Lambert93(const Raf98& raf98,double lambda,double phi,double he,double& E,double& N,double& h) {
    283     Geodesie::Geo2ProjLambert(
     282void Geodesy::Geographique_2_Lambert93(const Raf98& raf98,double lambda,double phi,double he,double& E,double& N,double& h) {
     283    Geodesy::Geo2ProjLambert(
    284284                lambda,phi,
    285285                n_Lambert93,c_Lambert93,e_Lambert93,
     
    293293
    294294/// Converts Lambert93 coordinates (East, North, Height) into geographical coordinates in radians (Longitude = Rad2Deg(lambda), Latitude = Rad2Deg(phi), Height)
    295 void Geodesie::Lambert93_2_Geographique(const Raf98& raf98,double E,double N,double h,double& lambda,double& phi,double& he) {
    296     Geodesie::Proj2GeoLambert(
     295void Geodesy::Lambert93_2_Geographique(const Raf98& raf98,double E,double N,double h,double& lambda,double& phi,double& he) {
     296    Geodesy::Proj2GeoLambert(
    297297                E,N,
    298298                n_Lambert93,c_Lambert93,e_Lambert93,
     
    307307
    308308////////////////////////////////////////////////////////////////////////
    309 void Geodesie::Lambert93_2_Geographique(const Raf98& raf98,double E,double N,double h,Matrice in,double& lambda,double& phi,double& he,Matrice& out) {
    310     Geodesie::Proj2GeoLambert(
     309void Geodesy::Lambert93_2_Geographique(const Raf98& raf98,double E,double N,double h,Matrice in,double& lambda,double& phi,double& he,Matrice& out) {
     310    Geodesy::Proj2GeoLambert(
    311311                E,N,
    312312                n_Lambert93,c_Lambert93,e_Lambert93,
     
    316316
    317317    Matrice passage;
    318     double conv=Geodesie::ConvMerApp(lambda);
     318    double conv=Geodesy::ConvMerApp(lambda);
    319319    double c_=cos(conv);
    320320    double s_=sin(conv);
     
    340340
    341341////////////////////////////////////////////////////////////////////////
    342 void Geodesie::Geographique_2_ECEF(double longitude,double latitude,double he,double& x,double& y,double& z) {
     342void Geodesy::Geographique_2_ECEF(double longitude,double latitude,double he,double& x,double& y,double& z) {
    343343    const double n = GRS_a / sqrt(1.0 - pow(GRS_e,2) * pow(sin(latitude),2));
    344344    x = (n + he) * cos(latitude) * cos(longitude);
     
    348348
    349349////////////////////////////////////////////////////////////////////////
    350 void Geodesie::ECEF_2_ENU(double x,double y,double z,double& e,double& n,double& u,double lon0,double lat0,double he0) {
     350void Geodesy::ECEF_2_ENU(double x,double y,double z,double& e,double& n,double& u,double lon0,double lat0,double he0) {
    351351    double slat = std::sin(lat0);
    352352    double clat = std::cos(lat0);
     
    354354    double clon = std::cos(lon0);
    355355
    356     Geodesie::Matrice C;
     356    Geodesy::Matrice C;
    357357    C.c0_l0 = -slon;
    358358    C.c1_l0 = clon;
     
    376376}
    377377
    378 QMatrix4x4 Geodesie::yprenuToMatrix(QVector3D angle, QVector3D position)
     378QMatrix4x4 Geodesy::yprenuToMatrix(QVector3D angle, QVector3D position)
    379379{
    380380    float c1 = cos(angle.x());
Note: See TracChangeset for help on using the changeset viewer.