Changeset 148 in pacpusframework for branches/2.0-beta1/include/Pacpus/PacpusTools

Timestamp:

Jul 31, 2013, 2:42:05 PM (11 years ago)

Author:

Marek Kurdej

Message:

Corrections in PacpusEvent, InputOutputBase, InputOutputInterface.
Fixed: DLL import/export in geodesie.h.

Location:

branches/2.0-beta1/include/Pacpus/PacpusTools

Files:

• ShMem.h (modified) (1 diff)
• geodesie.h (modified) (6 diffs)

branches/2.0-beta1/include/Pacpus/PacpusTools/ShMem.h

@@ -32 +32 @@
 ///
 /// Inherits from Win32ShMem on Windows system and from PosixShMem on Unix-like systems.
-class PACPUS_TOOLS_API ShMem
+class /*PACPUS_TOOLS_API*/ ShMem
     : public ShMemType
 {

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

@@ -128 +128 @@
 
 ////////////////////////////////////////////////////////////////////////
-void Geographique_2_Lambert93(const Raf98& raf98,double lambda,double phi,double he,Matrice in,double& E,double& N,double& h,Matrice& out);
-void Geographique_2_Lambert93(const Raf98& raf98,double lambda,double phi,double he,double& E,double& N,double& h);
-void Lambert93_2_Geographique(const Raf98& raf98,double E,double N,double h,double& lambda,double& phi,double& he);
-void Lambert93_2_Geographique(const Raf98& raf98,double E,double N,double h,Matrice in,double& lambda,double& phi,double& he,Matrice& out);
+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);
+PACPUS_TOOLS_API void Geographique_2_Lambert93(const Raf98& raf98,double lambda,double phi,double he,double& E,double& N,double& h);
+PACPUS_TOOLS_API void Lambert93_2_Geographique(const Raf98& raf98,double E,double N,double h,double& lambda,double& phi,double& he);
+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);
 /** Convert from geographique to ECEF.
  * @param[in] longitude Longitude in radian.
@@ -137 +137 @@
  * @param[in] he Height in meter.
  */
-void Geographique_2_ECEF(double longitude, double latitude, double he, double& x, double& y, double& z);
+PACPUS_TOOLS_API void Geographique_2_ECEF(double longitude, double latitude, double he, double& x, double& y, double& z);
 /** Convert from ECEF two ENU.
  * @param[in] lon0 Longitude of the origin in radian.
@@ -143 +143 @@
  * @param[in] he0 Height of the origin in radian.
  */
-void ECEF_2_ENU(double x,double y,double z,double& e,double& n,double& u,double lon0,double lat0,double he0);
+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);
 ////////////////////////////////////////////////////////////////////////
 
 ///ALGO0001
 /// @todo Rename
-double LatitueIsometrique(double latitude,double e);
+PACPUS_TOOLS_API double LatitueIsometrique(double latitude,double e);
 ///ALGO0002
 /// @todo Rename
-double LatitueIsometrique2Lat(double latitude_iso,double e,double epsilon);
+PACPUS_TOOLS_API double LatitueIsometrique2Lat(double latitude_iso,double e,double epsilon);
 
 ///ALGO0003
-void Geo2ProjLambert(
+PACPUS_TOOLS_API void Geo2ProjLambert(
     double lambda,double phi,
     double n, double c,double e,
@@ -160 +160 @@
     double& X,double& Y);
 ///ALGO0004
-void Proj2GeoLambert(
+PACPUS_TOOLS_API void Proj2GeoLambert(
     double X,double Y,
     double n, double c,double e,
@@ -167 +167 @@
     double& lambda,double& phi);
 
-double ConvMerApp(double longitude);
+PACPUS_TOOLS_API double ConvMerApp(double longitude);
 
 /**
@@ -209 +209 @@
 }
 
-QMatrix4x4 yprenuToMatrix(QVector3D angle, QVector3D position);
+PACPUS_TOOLS_API QMatrix4x4 yprenuToMatrix(QVector3D angle, QVector3D position);
 
 } // namespace Geodesie