Changeset 198 in pacpusframework

Timestamp:

Oct 25, 2013, 11:40:51 AM (11 years ago)

Author:

Marek Kurdej

Message:

Minor fixes.

Location:

trunk

Files:

• include/Pacpus/PacpusTools/geodesie.h (modified) (4 diffs)
• include/Pacpus/kernel/pacpus.h (modified) (1 diff)
• src/PacpusTools/CMakeLists.txt (modified) (1 diff)
• src/PacpusTools/src/geodesie.cpp (modified) (1 diff)

trunk/include/Pacpus/PacpusTools/geodesie.h

@@ -15 +15 @@
 #define GEODESIE_H
 
+#include "PacpusToolsConfig.h"
+
+//#include <boost/math/constants/constants.hpp>
 #include <cmath>
 #include <iostream>
@@ -21 +24 @@
 #include <QMatrix4x4>
 #include <QVector3D>
-
-#include "PacpusToolsConfig.h"
 
 namespace Geodesie {
@@ -72 +73 @@
 
 PACPUSTOOLS_API Matrice TransMat(const Matrice A);
-PACPUSTOOLS_API Matrice ProdMat(const Matrice A,const Matrice B);
-PACPUSTOOLS_API void Write(const Matrice A,std::ostream& out);
+PACPUSTOOLS_API Matrice ProdMat(const Matrice A, const Matrice B);
+PACPUSTOOLS_API void Write(const Matrice A, std::ostream & out);
 
 ////////////////////////////////////////////////////////////////////////
@@ -105 +106 @@
 inline double Deg2Rad(double deg)
 {
-    return deg*M_PI/180.0;
+    return deg * M_PI / 180.0;
 }
 
 inline double Rad2Deg(double rad)
 {
-    return rad*180.0/M_PI;
+    return rad * 180.0 / M_PI;
 }
 

trunk/include/Pacpus/kernel/pacpus.h

@@ -17 +17 @@
 
 #include <Pacpus/kernel/road_time.h>
-
-/// Pi math constant
-/// 
-/// @deprecated Use M_PI from \<cmath\>.
-#ifndef PACPUS_PI
-#   define PACPUS_PI       3.1415926
-#endif
 
 /// @def PACPUS_DEPRECATED(func)

trunk/src/PacpusTools/CMakeLists.txt

@@ -91 +91 @@
 # Build a library
 # ========================================
-pacpus_add_library(
-    ${PROJECT_NAME} SHARED
+pacpus_add_library(${PROJECT_NAME} SHARED
+    ${PROJECT_HDRS}
     ${PROJECT_SRCS}
     ${PROJECT_MOC_SRCS}

trunk/src/PacpusTools/src/geodesie.cpp

@@ -9 +9 @@
 
 #include <fstream>
+
+//using boost::math::constants::pi;
 
 #ifdef _MSC_VER