Ignore:
Timestamp:
08/01/13 16:46:07 (11 years ago)
Author:
Marek Kurdej
Message:

Update: merged changes from trunk.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/2.0-beta1/include/Pacpus/PacpusTools/geodesie.h

    r149 r162  
    44// %}
    55/// @file
    6 /// @author  Firstname Surname <firstname.surname@utc.fr>
    7 /// @date    Month, Year
     6/// @author  Jean Laneurit <firstname.surname@utc.fr>
     7/// @date    April, 2010
    88/// @version $Id: geodesie.h 75 2013-01-10 17:04:19Z kurdejma $
    99/// @copyright Copyright (c) UTC/CNRS Heudiasyc 2006 - 2013. All rights reserved.
    … …  
    4040/// @todo Documentation
    4141/// @todo Rewrite!
    42 struct PACPUS_TOOLS_API Matrice
     42struct PACPUSTOOLS_API Matrice
    4343{
    4444    /// Copy ctor
    … …  
    7171};
    7272
    73 PACPUS_TOOLS_API Matrice TransMat(const Matrice A);
    74 PACPUS_TOOLS_API Matrice ProdMat(const Matrice A,const Matrice B);
    75 PACPUS_TOOLS_API void Write(const Matrice A,std::ostream& out);
     73PACPUSTOOLS_API Matrice TransMat(const Matrice A);
     74PACPUSTOOLS_API Matrice ProdMat(const Matrice A,const Matrice B);
     75PACPUSTOOLS_API void Write(const Matrice A,std::ostream& out);
    7676
    7777////////////////////////////////////////////////////////////////////////
    7878/// @todo Documentation
    79 class PACPUS_TOOLS_API Raf98
     79class PACPUSTOOLS_API Raf98
    8080{
    8181public:
    … …  
    135135
    136136////////////////////////////////////////////////////////////////////////
    137 PACPUS_TOOLS_API void Geographique_2_Lambert93(const Raf98& raf98,double lambda,double phi,double he,Matrice in,double& E,double& N,double& h,Matrice& out);
    138 PACPUS_TOOLS_API void Geographique_2_Lambert93(const Raf98& raf98,double lambda,double phi,double he,double& E,double& N,double& h);
    139 PACPUS_TOOLS_API void Lambert93_2_Geographique(const Raf98& raf98,double E,double N,double h,double& lambda,double& phi,double& he);
    140 PACPUS_TOOLS_API void Lambert93_2_Geographique(const Raf98& raf98,double E,double N,double h,Matrice in,double& lambda,double& phi,double& he,Matrice& out);
     137PACPUSTOOLS_API void Geographique_2_Lambert93(const Raf98& raf98,double lambda,double phi,double he,Matrice in,double& E,double& N,double& h,Matrice& out);
     138PACPUSTOOLS_API void Geographique_2_Lambert93(const Raf98& raf98,double lambda,double phi,double he,double& E,double& N,double& h);
     139PACPUSTOOLS_API void Lambert93_2_Geographique(const Raf98& raf98,double E,double N,double h,double& lambda,double& phi,double& he);
     140PACPUSTOOLS_API void Lambert93_2_Geographique(const Raf98& raf98,double E,double N,double h,Matrice in,double& lambda,double& phi,double& he,Matrice& out);
    141141/** Convert from geographique to ECEF.
    142142 * @param[in] longitude Longitude in radian.
    … …  
    144144 * @param[in] he Height in meter.
    145145 */
    146 PACPUS_TOOLS_API void Geographique_2_ECEF(double longitude, double latitude, double he, double& x, double& y, double& z);
     146PACPUSTOOLS_API void Geographique_2_ECEF(double longitude, double latitude, double he, double& x, double& y, double& z);
    147147/** Convert from ECEF two ENU.
    148148 * @param[in] lon0 Longitude of the origin in radian.
    … …  
    150150 * @param[in] he0 Height of the origin in radian.
    151151 */
    152 PACPUS_TOOLS_API void ECEF_2_ENU(double x,double y,double z,double& e,double& n,double& u,double lon0,double lat0,double he0);
     152PACPUSTOOLS_API void ECEF_2_ENU(double x,double y,double z,double& e,double& n,double& u,double lon0,double lat0,double he0);
    153153////////////////////////////////////////////////////////////////////////
    154154
    155155///ALGO0001
    156156/// @todo Rename
    157 PACPUS_TOOLS_API double LatitueIsometrique(double latitude,double e);
     157PACPUSTOOLS_API double LatitueIsometrique(double latitude,double e);
    158158///ALGO0002
    159159/// @todo Rename
    160 PACPUS_TOOLS_API double LatitueIsometrique2Lat(double latitude_iso,double e,double epsilon);
     160PACPUSTOOLS_API double LatitueIsometrique2Lat(double latitude_iso,double e,double epsilon);
    161161
    162162///ALGO0003
    163 PACPUS_TOOLS_API void Geo2ProjLambert(
     163PACPUSTOOLS_API void Geo2ProjLambert(
    164164    double lambda,double phi,
    165165    double n, double c,double e,
    … …  
    167167    double& X,double& Y);
    168168///ALGO0004
    169 PACPUS_TOOLS_API void Proj2GeoLambert(
     169PACPUSTOOLS_API void Proj2GeoLambert(
    170170    double X,double Y,
    171171    double n, double c,double e,
    … …  
    174174    double& lambda,double& phi);
    175175
    176 PACPUS_TOOLS_API double ConvMerApp(double longitude);
     176PACPUSTOOLS_API double ConvMerApp(double longitude);
    177177
    178178/**
    … …  
    216216}
    217217
    218 PACPUS_TOOLS_API QMatrix4x4 yprenuToMatrix(QVector3D angle, QVector3D position);
     218PACPUSTOOLS_API QMatrix4x4 yprenuToMatrix(QVector3D angle, QVector3D position);
    219219
    220220} // namespace Geodesie
Note: See TracChangeset for help on using the changeset viewer.