Changeset 99 in pacpussensors for trunk

Timestamp:

Oct 15, 2015, 2:47:01 PM (9 years ago)

Author:

nguyenhu

Message:

compilation under linux with 0.2.X framework

Location:

trunk

Files:

• Alasca/CMakeLists.txt (modified) (4 diffs)
• CMakeLists.txt (modified) (2 diffs)
• CanGateway/CMakeLists.txt (modified) (7 diffs)
• Dualshock/CMakeLists.txt (modified) (3 diffs)
• Dualshock/controller.h (modified) (1 diff)
• Dualshock/dualshock.h (modified) (1 diff)
• Gps/CMakeLists.txt (modified) (5 diffs)
• Gps/SeptentrioComponent.h (modified) (1 diff)
• Gps/SeptentrioSocket.cpp (modified) (1 diff)
• Gps/gpsComponent.cpp (modified) (29 diffs)
• Gps/gpsComponent.h (modified) (7 diffs)
• Gps/ui/polarxmainwindow.cpp (modified) (2 diffs)
• Gps/ui/polarxmainwindow.hpp (modified) (2 diffs)
• Ladybug/LadybugComponent.cpp (modified) (8 diffs)
• Ladybug/LadybugComponent.h (modified) (2 diffs)
• NMEA0183/CMakeLists.txt (modified) (1 diff)
• NMEA0183/include/HSATIT.hpp (modified) (1 diff)
• NMEA0183/include/NMEA0183_slim.h (modified) (3 diffs)
• NMEA0183/include/nmea0183.h (modified) (1 diff)
• NMEA0183/src/HSATIT.cpp (modified) (10 diffs)
• OpencvVideo/CMakeLists.txt (modified) (4 diffs)
• PacpusSocket/CMakeLists.txt (modified) (3 diffs)
• PacpusSocket/PacpusUDPSocket.cpp (modified) (14 diffs)
• PacpusSocket/PacpusUDPSocket.h (modified) (9 diffs)
• PtGreyCameras/CMakeLists.txt (modified) (5 diffs)
• PtGreyCameras/Flea3Grabber.h (modified) (6 diffs)
• PtGreyCameras/PtGreyCamerasPlugin.cpp (modified) (2 diffs)
• PtGreyCameras/PtGreyCamerasPlugin.h (modified) (2 diffs)
• Sick/CMakeLists.txt (modified) (4 diffs)
• Sick/SickSocket.cpp (modified) (1 diff)
• SpanCPTComponent/CMakeLists.txt (modified) (7 diffs)
• SpanCPTComponent/CPTComponent.cpp (modified) (1 diff)
• SpanCPTComponent/CPTComponent.h (modified) (2 diffs)
• StdDbtPlayerComponents/CMakeLists.txt (modified) (4 diffs)
• StdDbtPlayerComponents/DbtPlySickLDMRSManager.h (modified) (3 diffs)
• StdDbtPlayerComponents/StdDbtPlayerComponentsConfig.h (modified) (1 diff)
• TelnetClient/CMakeLists.txt (modified) (3 diffs)
• TelnetClient/TelnetClient.cpp (modified) (3 diffs)
• VelodyneComponent/CMakeLists.txt (modified) (4 diffs)
• VelodyneComponent/VelodyneComponent.cpp (modified) (6 diffs)
• VelodyneComponent/VelodyneComponent.h (modified) (1 diff)
• Wifibot/CMakeLists.txt (modified) (3 diffs)
• Wifibot/ps3remote.cpp (modified) (1 diff)
• Wifibot/ps3remote.h (modified) (5 diffs)
• Wifibot/wifibot.cpp (modified) (5 diffs)
• Wifibot/wifibot.h (modified) (4 diffs)
• build/build_linux.sh (modified) (2 diffs)
• driver/PosixSerialPort.cpp (modified) (14 diffs)
• driver/PosixSerialPort.h (modified) (2 diffs)

trunk/Alasca/CMakeLists.txt

@@ +1 @@
+#########################quick start############################################
+#cmake ../ -G "CodeBlocks - Unix Makefiles"
+#make
+#make install
+#make clean
+################################################################################
 project(Alasca)
+set(${PROJECT_NAME}_VERSION_MAJOR 0)
+set(${PROJECT_NAME}_VERSION_MINOR 1)
+add_definitions( -DALASCAXT_EXPORTS ) 
+################################################################################
+create_export(EXPORT_HDR ${PROJECT_NAME})
+pacpus_plugin(PLUGIN_CPP PLUGIN_HDR ${PROJECT_NAME})
+add_definitions (${QT_DEFINITIONS})
 
+find_package(Qt5Network REQUIRED)
 ################################################################################
-add_definitions( -DALASCAXT_EXPORTS )
-
-
-
-# ========================================
-# Configure qt4
-# ========================================
-if(QT4_FOUND)
-  set(QT_USE_QTXML true)
-  set(QT_USE_QTNETWORK true)
-  include(${QT_USE_FILE})
-else()
-  message(ERROR "Qt4 needed")
-endif()
-
-# ========================================
-# Compiler definitions
-# ========================================
-add_definitions(
-  ${QT_DEFINITIONS}
-)
-
-# ========================================
-# Include directories
-# ========================================
-include_directories(
-  ${PROJECT_BINARY_DIR}
-  ${QT_INCLUDE_DIR}
+# DIRECTORIES
+include_directories( 
+    ${PROJECT_BINARY_DIR}
+    ${QT_INCLUDE_DIR}
+    ${PACPUS_INCLUDE_DIR} 
+    ${PACPUS_INCLUDE_DIR}/Pacpus/
 )
 
@@ -35 +27 @@
 # Link directories
 # ========================================
-link_directories( ${PACPUS_LIB_DIR}
+link_directories( 
+        ${PACPUS_LIB_DIR}
 )
 
 
-pacpus_plugin(PLUGIN_CPP PLUGIN_H ${PROJECT_NAME} )
-
-# ========================================
-# List of sources
-# ========================================
-set(
-    PROJECT_SRCS
-  AlascaComponent.cpp
-  AlascaComponent.h
-  AlascaSocket.cpp
-  AlascaSocket.h
+################################################################################
+# FILES
+set(PROJECT_HDRS
+    ${EXPORT_HDR}
+    AlascaComponent.h
+    AlascaSocket.h 
+    xml/${PROJECT_NAME}.xml
+    xml/${PROJECT_NAME}_d.xml
+)
+set(PROJECT_SRCS
     ${PLUGIN_CPP}
+    AlascaComponent.cpp
+    AlascaSocket.cpp 
 )
 
-# ========================================
-# Files to MOC
-# ========================================
-set(
-    FILES_TO_MOC
-     AlascaComponent.h
+set(FILES_TO_MOC
+    ${PLUGIN_HDR}
+    AlascaComponent.h
     AlascaSocket.h
-    ${PLUGIN_H}
 )
 
-set(
-    UI_FILES
-
+set(UI_FILES
 )
 
-# ========================================
-# Call MOC
-# ========================================
-qt4_wrap_cpp(
-    PROJECT_MOC_SRCS
+################################################################################
+# Qt: call moc, uic
+qt_wrap_cpp(PROJECT_MOC_SRCS
     ${FILES_TO_MOC}
 )
 
-qt4_wrap_ui(
-    PROJECT_UI_SRCS
+qt_wrap_ui(PROJECT_UI_SRCS
     ${UI_FILES}
 )
 
-# ========================================
-# Build a library
-# ========================================
-pacpus_add_library(
-    ${PROJECT_NAME} SHARED
+################################################################################
+# BUILD and LINK
+pacpus_add_library(${PROJECT_NAME} SHARED
+    ${PROJECT_HDRS}
     ${PROJECT_SRCS}
     ${PROJECT_MOC_SRCS}
@@ -91 +75 @@
 )
 
-message(STATUS  ${PACPUS_DEPENDENCIES_LIB} ) 
 
+# ========================================
+# Libraries
+# ========================================
 set(LIBS
     optimized FileLib debug FileLib_d
@@ -103 +89 @@
     )
 endif()
-
-# ========================================
-# Libraries
-# ========================================
-# All the platform
-target_link_libraries(
-    ${PROJECT_NAME}
-    ${PACPUS_LIBRARIES}
-    ${QT_LIBRARIES}
-        ${PACPUS_DEPENDENCIES_LIB}
-        ${LIBS}
-)
-
+# LINK 
+target_link_libraries(${PROJECT_NAME} 
+                      ${PACPUS_LIBRARIES} 
+                      ${PACPUS_DEPENDENCIES_LIB} 
+                      ${LIBS}
+                      ${QT_LIBRARIES} 
+                     )
+qt5_use_modules(${PROJECT_NAME} Network)
+################################################################################
+# FOLDERS
 pacpus_folder(${PROJECT_NAME} "components")
-
-# ========================================
-# Install
-# ========================================
-pacpus_install(${PROJECT_NAME})
+################################################################################
+# INSTALL
+pacpus_install(${PROJECT_NAME}) 

trunk/CMakeLists.txt

@@ -12 +12 @@
 project(PacpusSensors)
 cmake_minimum_required(VERSION 2.8)
+if(UNIX)
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x -fpermissive") #c++11
+endif()
 
 # ========================================
@@ -60 +63 @@
 
 # ========================================
-# Find dependencies
+# Build the ProjectExercise' modules
 # ========================================
-#find_package(Qt4 REQUIRED)
-#if(QT4_FOUND)
-#    set(QT_USE_QTNETWORK TRUE)
-#    set(QT_USE_QTOPENGL TRUE)
- #   set(QT_USE_QTXML TRUE)
- #   include(${QT_USE_FILE})
- #   add_definitions( ${QT_DEFINITIONS} )
- #   add_definitions( -DQT_PLUGIN )
-#endif(QT4_FOUND)
+#
+# In the following list add the plugin you want to build. 
+# Paths are relative to the root of the project. 
+#
 
-#include_directories(
-#  ${PACPUS_DEPENDENCIES_INC}
-#  ${PACPUS_INCLUDE_DIR}
-#  ${PACPUS_INCLUDE_HINT}
-#  ${PACPUS_INCLUDE_HINT}/Pacpus
-#  ./PACPUS/include
-#)
-
-
-# ========================================
-# Build the PacpusSensors' modules
-# ========================================
-# add_subdirectory(Alasca)
-add_subdirectory(CanGateway)
-# add_subdirectory(PtGreyCameras)
-# add_subdirectory(Dualshock)
-# add_subdirectory(PacpusSocket)
-# add_subdirectory(Sick)
-# add_subdirectory(StereoVisionDisparity)
-# add_subdirectory(SensorsApplication)
+#add_subdirectory(Alasca)
+add_subdirectory(CanGateway)       #require kvaser libcan
+add_subdirectory(PtGreyCameras)
+#add_subdirectory(Dualshock)
+add_subdirectory(NMEA0183)
+add_subdirectory(Gps)              #require NMEA0183
+add_subdirectory(SpanCPTComponent) #require NMEA0183
+#add_subdirectory(Sick)
+add_subdirectory(PacpusSocket)
+#add_subdirectory(OpencvVideo)
+#add_subdirectory(Wifibot)         #depends on PacpusSocket, change PacpusSocket to PacpusUdpSocket 
+#add_subdirectory(Ladybug)         #require Ladybug spherical camera's driver, not compiled yet
 add_subdirectory(StdDbtPlayerComponents)
-# add_subdirectory(Wifibot)
-# add_subdirectory(Gps)
-# add_subdirectory(SpanCPTComponent)
-# add_subdirectory(NMEA0183)
-# add_subdirectory(OpencvVideo)
-# add_subdirectory(Ladybug)
+#add_subdirectory(TelnetClient)
+#add_subdirectory(VelodyneComponent)
 
 # ========================================

trunk/CanGateway/CMakeLists.txt

@@ -8 +8 @@
 # Configure qt4
 # ========================================
-if(QT4_FOUND)
-  set(QT_USE_QTXML true)
-  set(QT_USE_QTNETWORK true)
-  include(${QT_USE_FILE})
-else()
-  message(ERROR "Qt4 needed")
-endif()
+#if(QT4_FOUND)
+#  set(QT_USE_QTXML true)
+#  set(QT_USE_QTNETWORK true)
+#  include(${QT_USE_FILE})
+#else()
+#  message(ERROR "Qt4 needed")
+#endif()
 
 # ========================================
@@ -49 +49 @@
     PROJECT_SRCS
         CanFrameBase.h
-    CanDecoderBase.cpp
-    CanDecoderBase.h
-    CanGateway.cpp
-    CanGateway.h
-    CanSubscription.cpp
-    CanSubscription.h
-    Win32CanInterface.cpp
-    Win32CanInterface.h
+        CanDecoderBase.cpp
+        CanDecoderBase.h
+        CanGateway.cpp
+        CanGateway.h
+        CanSubscription.cpp
+        CanSubscription.h
+        Win32CanInterface.cpp
+        Win32CanInterface.h
         DbtRawCanReader.h
-    DbtRawCanReader.cpp
+        DbtRawCanReader.cpp
         structureCan.h
         driver/KVaserCanDriver.cpp
@@ -71 +71 @@
         driver/XLVectorCanDriver.cpp
         driver/XLVectorCanDriver.h
-                driver/PeakCanDriverWin.h
-                driver/PeakCanDriverWin.cpp
+        driver/PeakCanDriverWin.h
+        driver/PeakCanDriverWin.cpp
     )
 endif(WIN32)
@@ -90 +90 @@
 set(
     FILES_TO_MOC
-        CanGateway.h
+    CanGateway.h
     DbtRawCanReader.h
     ${PLUGIN_H}
@@ -129 +129 @@
         # add your specific libraries to link here
         
-                optimized vcandm32.lib debug vcandm32.lib
-        optimized vxlapi.lib debug vxlapi.lib
-                optimized PCANBasic.lib debug PCANBasic.lib
-                optimized canlib32.lib debug canlib32.lib
+        optimized vcandm32.lib  debug vcandm32.lib
+        optimized vxlapi.lib    debug vxlapi.lib
+        optimized PCANBasic.lib debug PCANBasic.lib
+        optimized canlib32.lib  debug canlib32.lib
     )
 endif(WIN32)
@@ -149 +149 @@
     ${PACPUS_LIBRARIES}
     ${QT_LIBRARIES}
-        ${PACPUS_DEPENDENCIES_LIB}
-        ${LIBS}
-#       optimized PacpusTools debug PacpusTools_d
+    ${PACPUS_DEPENDENCIES_LIB}
+    ${LIBS}
+    #optimized PacpusTools debug PacpusTools_d
 )
 pacpus_folder(${PROJECT_NAME} "components")
@@ -166 +166 @@
     DESTINATION
         ${PACPUS_INSTALL_DIR}/include
+    FILES_MATCHING PATTERN "*.h"
 )
 # if WIN32 install driver dependencies

trunk/Dualshock/CMakeLists.txt

@@ -1 @@
-project(Dualshock)
+#########################quick start##################################
+#cmake ../ -G "CodeBlocks - Unix Makefiles"
+#make
+#make install
+#make clean
 ################################################################################
+project(TestDualShock)
 add_definitions( -DDUALSHOCKXT_EXPORTS )
-
-# ========================================
-# Configure qt4
-# ========================================
-if(QT4_FOUND)
-  set(QT_USE_QTXML true)
-  set(QT_USE_QTNETWORK true)
-  include(${QT_USE_FILE})
-else()
-  message(ERROR "Qt4 needed")
-endif()
-
-# ========================================
-# Compiler definitions
-# ========================================
-add_definitions(
-  ${QT_DEFINITIONS}
-)
-
-# ========================================
-# Include directories
-# ========================================
+set(${PROJECT_NAME}_VERSION_MAJOR 0)
+set(${PROJECT_NAME}_VERSION_MINOR 1)
+################################################################################
+create_export(EXPORT_HDR ${PROJECT_NAME})
+pacpus_plugin(PLUGIN_CPP PLUGIN_HDR ${PROJECT_NAME})
+################################################################################
+# DIRECTORIES
 include_directories(
-  ${PROJECT_BINARY_DIR}
-  ${QT_INCLUDE_DIR}
+    ${PROJECT_BINARY_DIR}
+    ${QT_INCLUDE_DIR}
+    ${PACPUS_INCLUDE_DIR}
+    ${PACPUS_INCLUDE_DIR}/Pacpus/
 )
 
@@ -32 +24 @@
 # Link directories
 # ========================================
-link_directories( ${PACPUS_LIB_DIR}
+link_directories( 
+        ${PACPUS_LIB_DIR}
 )
 
-message (STATUS ${PACPUS_LIB_DIR})
 
-pacpus_plugin(PLUGIN_CPP PLUGIN_H ${PROJECT_NAME} )
-
-# ========================================
-# List of sources
-# ========================================
-set(
-    PROJECT_SRCS
-    controller.cpp
-    dualshock.cpp
+################################################################################
+# FILES
+set(PROJECT_HDRS
+    ${EXPORT_HDR}
+    dualshock.h 
+    controller.h 
+    xml/${PROJECT_NAME}.xml
+    xml/${PROJECT_NAME}_d.xml
+)
+set(PROJECT_SRCS
     ${PLUGIN_CPP}
+    dualshock.cpp 
+    controller.cpp 
 )
 
-# ========================================
-# Files to MOC
-# ========================================
-set(
-    FILES_TO_MOC
-    controller.h
-    dualshock.h
-    ${PLUGIN_H}
+set(FILES_TO_MOC
+    ${PLUGIN_HDR}
+    controller.h 
 )
 
-set(
-    UI_FILES
-
+set(UI_FILES
 )
 
-# ========================================
-# Call MOC
-# ========================================
-qt4_wrap_cpp(
-    PROJECT_MOC_SRCS
+################################################################################
+# Qt: call moc, uic
+qt_wrap_cpp(PROJECT_MOC_SRCS
     ${FILES_TO_MOC}
 )
 
-qt4_wrap_ui(
-    PROJECT_UI_SRCS
+qt_wrap_ui(PROJECT_UI_SRCS
     ${UI_FILES}
 )
 
-# ========================================
-# Build a library
-# ========================================
-pacpus_add_library(
-    ${PROJECT_NAME} SHARED
+################################################################################
+# BUILD and LINK
+pacpus_add_library(${PROJECT_NAME} SHARED
+    ${PROJECT_HDRS}
     ${PROJECT_SRCS}
     ${PROJECT_MOC_SRCS}
@@ -87 +71 @@
 )
 
-message(STATUS  ${PACPUS_DEPENDENCIES_LIB} ) 
 
 # ========================================
 # Libraries
 # ========================================
-# All the platform
-target_link_libraries(
-    ${PROJECT_NAME}
-    ${PACPUS_LIBRARIES}
-    ${QT_LIBRARIES}
-        ${PACPUS_DEPENDENCIES_LIB}
-        PacpusTools
+set(LIBS
+    optimized FileLib debug FileLib_d
+    optimized PacpusLib debug PacpusLib_d
+    optimized PacpusTools debug PacpusTools_d
 )
+if (WIN32)
+    list(APPEND LIBS
+        optimized ROAD_TIME debug ROAD_TIME_d
+    )
+endif()
 
-# ========================================
-# Install
-# ========================================
-pacpus_install(${PROJECT_NAME})
+# LINK 
+target_link_libraries(${PROJECT_NAME} 
+                      ${PACPUS_LIBRARIES} 
+                      ${PACPUS_DEPENDENCIES_LIB} 
+                      ${LIBS})
 
+################################################################################
+# FOLDERS
+pacpus_folder(${PROJECT_NAME} "components")
+
+################################################################################
+# INSTALL
+pacpus_install(${PROJECT_NAME}) 

trunk/Dualshock/controller.h

@@ -24 +24 @@
 # include <QThread>
 
-# include "kernel/ComponentBase.h"
-# include "kernel/DbiteFile.h"
-# include "kernel/DbiteFileTypes.h"
-# include "PacpusTools/ShMem.h"
+# include <kernel/ComponentBase.h>
+# include <kernel/DbiteFile.h>
+# include <kernel/DbiteFileTypes.h>
+# include <PacpusTools/ShMem.h>
 
 # define L2CAP_PSM_HIDP_CTRL 0x11

trunk/Dualshock/dualshock.h

@@ -15 +15 @@
 # define DUALSHOCK_H
 
-# include "kernel/ComponentBase.h"
-# include "kernel/DbiteFile.h"
+# include <kernel/ComponentBase.h>
+# include <kernel/DbiteFile.h>
 # include "controller.h"
 

trunk/Gps/CMakeLists.txt

@@ +1 @@
+#########################quick start############################################
+#cmake ../ -G "CodeBlocks - Unix Makefiles"
+#make
+#make install
+#make clean
+################################################################################
 project(Gps)
+set(${PROJECT_NAME}_VERSION_MAJOR 0)
+set(${PROJECT_NAME}_VERSION_MINOR 1)
+add_definitions( -DGPS_EXPORTS )
 ################################################################################
+create_export(EXPORT_HDR ${PROJECT_NAME})
+pacpus_plugin(PLUGIN_CPP PLUGIN_HDR ${PROJECT_NAME})
+add_definitions (${QT_DEFINITIONS})
 
-add_definitions( -DGPS_EXPORTS )
-
-# ========================================
-# Configure qt4
-# ========================================
-if(QT4_FOUND)
-  set(QT_USE_QTXML true)
-  set(QT_USE_QTNETWORK true)
-  include(${QT_USE_FILE})
-else()
-  message(ERROR "Qt4 needed")
-endif()
-
-# ========================================
-# Compiler definitions
-# ========================================
-add_definitions(
-  ${QT_DEFINITIONS}
-)
-
-# ========================================
-# Include directories
-# ========================================
-include_directories(
-  ${PROJECT_BINARY_DIR}
-  ${QT_INCLUDE_DIR}
+find_package(Qt5Network REQUIRED)
+find_package(Qt5Widgets REQUIRED)
+################################################################################
+# DIRECTORIES
+include_directories( 
+    ${PROJECT_BINARY_DIR}
+    ${QT_INCLUDE_DIR}
+    ${PACPUS_INCLUDE_DIR}
+    ${PACPUS_INCLUDE_DIR}/Pacpus/
 )
 
@@ -38 +33 @@
 
 
-pacpus_plugin(PLUGIN_CPP PLUGIN_H ${PROJECT_NAME} )
-
-# ========================================
-# List of sources
-# ========================================
-set(
-    PROJECT_SRCS
-  gpsComponent.cpp
-  gpsComponent.h
-  GpsFrames.h
-#  SeptentrioSocket.h
-#  SeptentrioSocket.cpp
-#  SeptentrioComponent.h
-#  SeptentrioComponent.cpp
-  #UbloxComponent.h
-  #UbloxComponent.cpp
-  #polarxGPSTKsolver.cpp
-#  ui/polarxmainwindow.hpp
-#  ui/polarxmainwindow.cpp
+################################################################################
+# FILES
+set(PROJECT_HDRS
+    ${EXPORT_HDR}
+    gpsComponent.h
+    GpsFrames.h
+    SeptentrioSocket.h
+    SbfFrames.h
+    structure_gps.h
+    xml/gps_nmea.xml 
+)
+set(PROJECT_SRCS
     ${PLUGIN_CPP}
+    gpsComponent.cpp 
+    SeptentrioSocket.cpp
+    ui/polarxmainwindow.cpp
 )
 
@@ -76 +67 @@
 endif(UNIX)
 
-
-# ========================================
-# Files to MOC
-# ========================================
-
 if(UNIX)
 set(FILES_TO_MOC 
   # add here the header files that you want to MOC
   gpsComponent.h
-  SeptentrioComponent.h
+  GpsFrames.h
+  #SeptentrioComponent.h
   SeptentrioSocket.h  
   ../driver/PosixSerialPort.h
   ui/polarxmainwindow.hpp
-    ${PLUGIN_H}
+  ${PLUGIN_HDR}
   )
 endif(UNIX)
@@ -97 +84 @@
   # add here the header files that you want to MOC
   gpsComponent.h
-#  SeptentrioComponent.h
-#  SeptentrioSocket.h    
+  # SeptentrioComponent.h
+  # SeptentrioSocket.h    
   ../driver/Win32SerialPort.h
-#  ui/polarxmainwindow.hpp
-  ${PLUGIN_H}
+  #  ui/polarxmainwindow.hpp
+  ${PLUGIN_HDR}
   )
 endif(WIN32)
 
-set(
-    UI_FILES
+set(UI_FILES
 )
 
-# ========================================
-# Call MOC
-# ========================================
-qt4_wrap_cpp(
-    PROJECT_MOC_SRCS
+################################################################################
+# Qt: call moc, uic
+qt_wrap_cpp(PROJECT_MOC_SRCS
     ${FILES_TO_MOC}
 )
 
-qt4_wrap_ui(
-    PROJECT_UI_SRCS
+qt_wrap_ui(PROJECT_UI_SRCS
     ${UI_FILES}
 )
 
-# ========================================
-# Build a library
-# ========================================
-pacpus_add_library(
-    ${PROJECT_NAME} SHARED
+################################################################################
+# BUILD and LINK
+pacpus_add_library(${PROJECT_NAME} SHARED
+    ${PROJECT_HDRS}
     ${PROJECT_SRCS}
     ${PROJECT_MOC_SRCS}
@@ -132 +114 @@
 )
 
+
 # ========================================
 # Libraries
 # ========================================
-if(WIN32)
-    set(LIBS
-        # add your specific libraries to link here
-        optimized NMEA0183LIB debug NMEA0183LIB_d
+set(LIBS
+    optimized FileLib debug FileLib_d
+    optimized PacpusLib debug PacpusLib_d
+    optimized PacpusTools debug PacpusTools_d
+    optimized NMEA0183LIB debug NMEA0183LIB_d
+)
+if (WIN32)
+    list(APPEND LIBS 
+        optimized ROAD_TIME debug ROAD_TIME_d
     )
-endif(WIN32)
-
-if(UNIX)
-    set(LIBS
-        # add your specific libraries to link here
-
-    )
-endif(UNIX)
-
-# All the platform
-target_link_libraries(
-    ${PROJECT_NAME}
-    ${PACPUS_LIBRARIES}
-    ${QT_LIBRARIES}
-        ${PACPUS_DEPENDENCIES_LIB}
-        ${LIBS}
-#       optimized PacpusTools debug PacpusTools_d
-)
+endif()
+# LINK 
+target_link_libraries(${PROJECT_NAME} 
+                      ${PACPUS_LIBRARIES} 
+                      ${PACPUS_DEPENDENCIES_LIB} 
+                      ${LIBS}
+                      ${QT_LIBRARIES}  
+                     )
+qt5_use_modules(${PROJECT_NAME} Network)
+################################################################################
+# FOLDERS
 pacpus_folder(${PROJECT_NAME} "components")
-
-# ========================================
-# Install
-# ========================================
-pacpus_install(${PROJECT_NAME})
+################################################################################
+# INSTALL
+pacpus_install(${PROJECT_NAME}) 

trunk/Gps/SeptentrioComponent.h

@@ -15 +15 @@
 // #include "polarxGPSTKsolver.hpp"
 
-#include "structure/structure_septentrio.h"
+#include "structure_gps.h"
 #include "SerialCom/SerialCOM_Handle_Stream.hpp"
 #include "SerialCom/SBF/SerialCOM_Protocol_SBF.hpp"

trunk/Gps/SeptentrioSocket.cpp

@@ -15 +15 @@
 
 #include "SeptentrioSocket.h"
-#include "SeptentrioComponent.h"
+//#include "SeptentrioComponent.h"
 #include <QApplication>
 #include <QtDebug>

trunk/Gps/gpsComponent.cpp

@@ -18 +18 @@
 #include <iostream>
 
+#define PACPUS_PI 3.1415926
+
 namespace pacpus {
 
 /// Construct the factory
-ComponentFactory<GpsComponent> sFactory("GpsComponent"); 
+ComponentFactory<GpsComponent> sFactory("GpsComponent");
 
 DECLARE_STATIC_LOGGER("pacpus.base.GpsComponent");
@@ -35 +37 @@
     : semaphore_(0)
     , ComponentBase(name)
-    
-{    
-  
-  ppsRecording = TRUE;
-  ggaRecording = TRUE; 
-  gsaRecording = TRUE; 
-  gstRecording = TRUE; 
-  gsvRecording = TRUE;
-  hdtRecording = TRUE; 
-  rmcRecording = TRUE; 
-  rotRecording = TRUE; 
-  vtgRecording = TRUE; 
-  zdaRecording = TRUE; 
-
-/*  ppshdFile = NULL; 
-  ggahdFile = NULL; 
-  gsahdFile = NULL; 
-  gsthdFile = NULL; 
-  gsvhdFile = NULL; 
-  hdthdFile = NULL; 
-  rmchdFile = NULL; 
-  rothdFile = NULL; 
-  vtghdFile = NULL; 
-  zdahdFile = NULL; 
+
+{
+
+  ppsRecording = true;//TRUE
+  ggaRecording = true;
+  gsaRecording = true;
+  gstRecording = true;
+  gsvRecording = true;
+  hdtRecording = true;
+  rmcRecording = true;
+  rotRecording = true;
+  vtgRecording = true;
+  zdaRecording = true;
+
+/*  ppshdFile = NULL;
+  ggahdFile = NULL;
+  gsahdFile = NULL;
+  gsthdFile = NULL;
+  gsvhdFile = NULL;
+  hdthdFile = NULL;
+  rmchdFile = NULL;
+  rothdFile = NULL;
+  vtghdFile = NULL;
+  zdahdFile = NULL;
 */
- 
-  
+
+
   nextByteToProcess_ = 0;
   currentFrame_ = NULL;
-  newFrameToDecode_ = false; 
-  startOfFrame_ = false; 
+  newFrameToDecode_ = false;
+  startOfFrame_ = false;
   endOfFrame_ = false;
 }
@@ -81 +83 @@
 ComponentBase::COMPONENT_CONFIGURATION GpsComponent::configureComponent(XmlComponentConfig config)
 {
-  setPortCOM( config.getProperty("port").toLatin1() );   
+  setPortCOM( config.getProperty("port").toLatin1() );
   setRecording ((config.getProperty("recording") == "true" ? true : false));
 
@@ -90 +92 @@
 void GpsComponent::setPortCOM(const char * port)
 {
-  portName_ = port; 
+  portName_ = port;
 }
 
@@ -111 +113 @@
 void GpsComponent::run()
 {
-  int type = -1; 
-  
+  int type = -1;
+
   // parity:0-4=no,odd,even,mark,space
   // byteSize:number of bits/byte, 4-8
-  // baudRate:port speed (ex:38400) 
-  // stopBits:0,1,2 = 1, 1.5, 2 
-  
-  serialPort->configurePort(xmlParameters().getProperty("baudrate").toLong(), 
+  // baudRate:port speed (ex:38400)
+  // stopBits:0,1,2 = 1, 1.5, 2
+
+  serialPort->configurePort(xmlParameters().getProperty("baudrate").toLong(),
     xmlParameters().getProperty("bytesize").toUInt(),
     //  config.getProperty("parity").at(0).toLatin1(),
     xmlParameters().getProperty("parity").toShort(),
-    xmlParameters().getProperty("stopbits").toUInt() - 1); 
-
-
-  serialPort->start(); 
- 
+    xmlParameters().getProperty("stopbits").toUInt() - 1);
+
+
+  serialPort->start();
+
   while (isActive())
-  { 
+  {
     // If there are no bytes remaining in the current frame, delete it
     if ((currentFrame_ != NULL) && (nextByteToProcess_ >= currentFrame_->data.length())) {
-      delete currentFrame_; 
+      delete currentFrame_;
       currentFrame_ = NULL;
     }
@@ -139 +141 @@
       semaphore_.acquire();
       if  ((currentFrame_ = serialPort->getNextFrame()) == NULL) {
-        // Should never get to this point as the semaphore counts the frames, unless 
+        // Should never get to this point as the semaphore counts the frames, unless
         // the thread is being stopped.
         continue;
@@ -151 +153 @@
       lastPpsTime_ = currentFrame_->t;
       decodeFrame(SIGNAL_PPS);
-    } else if (analyzeFrame()) { 
+    } else if (analyzeFrame()) {
       // a new complete NMEA frame has arrived, decode it.
-      type = frameType(frameToDecode_.data); 
+      type = frameType(frameToDecode_.data);
       if (type != -1) {
         if (decodeFrame(type) == -1) {
-            qWarning("Failed to decode the dataframe\n"); 
+            qWarning("Failed to decode the dataframe\n");
         }
       }
@@ -164 +166 @@
   }
 
-  qDebug() << "The thread of " << name() << " GPS component is stopped"; 
+  qDebug() << "The thread of " << name() << " GPS component is stopped";
 }
 
@@ -174 +176 @@
 void GpsComponent::stopActivity()
 {
-  setActive( FALSE ); 
+  setActive( false );
   unlockProcessing(1); // to unblock the thread that is waiting new data
-  
-  serialPort->THREAD_ALIVE = FALSE; 
+
+  serialPort->THREAD_ALIVE = false;
 
   if (!serialPort->wait(2000))
   {
-    serialPort->terminate(); 
+    serialPort->terminate();
     qDebug("The Win32SerialPort thread blocks anormally, it has been killed !!");
   }
-  if ( !serialPort->closePort() ) 
-    qDebug("Failed to close the port"); 
+  if ( !serialPort->closePort() )
+    qDebug("Failed to close the port");
   else
-    qDebug("The port is closed"); 
+    qDebug("The port is closed");
   delete serialPort;
 
   if (ppshdFile.isOpen())
-          ppshdFile.close(); 
+          ppshdFile.close();
   if (ggahdFile.isOpen())
           ggahdFile.close();
   if (gsahdFile.isOpen())
-    gsahdFile.close(); 
+    gsahdFile.close();
   if (gsthdFile.isOpen())
     gsthdFile.close();
@@ -203 +205 @@
     hdthdFile.close();
   if (rmchdFile.isOpen())
-          rmchdFile.close(); 
+          rmchdFile.close();
   if (rothdFile.isOpen())
           rothdFile.close();
   if (vtghdFile.isOpen())
-          vtghdFile.close(); 
+          vtghdFile.close();
   if (zdahdFile.isOpen())
           zdahdFile.close();
@@ -219 +221 @@
 {
   ppsIndex_ = 0;
-  
-  setActive( TRUE );   
-  
+
+  setActive( true );
+
 #if WIN32
-  serialPort = new Win32SerialPort(portName_.toLatin1());  
+  serialPort = new Win32SerialPort(portName_.toLatin1());
   // Asynchrone
-  serialPort->setMode(FILE_FLAG_OVERLAPPED); 
+  serialPort->setMode(FILE_FLAG_OVERLAPPED);
   // Synchrone
-  //serialPort->setMode(0); 
-#else 
-  serialPort = new PosixSerialPort(portName.toLatin1());  
+  //serialPort->setMode(0);
+#else
+  serialPort = new PosixSerialPort(portName_.toLatin1());
 #endif
-  
+
   if (!serialPort->openPort(portName_.toLatin1()))
   {
     qDebug() << "Failed to open the port " << portName_;
     qDebug() << "The GPS Component " << name() << " didn't start";
-    return; 
+    return;
   }
-  
-  serialPort->THREAD_ALIVE = TRUE; 
+
+  serialPort->THREAD_ALIVE = true;
   if (!QApplication::connect(serialPort,SIGNAL(newDataAvailable(int)),this, SLOT(unlockProcessing(int))))
-    qWarning("Failed to connect SIGNAL(newDataAvailable(int)) with SLOT(unlockProcessing(int)\n" );   
-  start(); 
+    qWarning("Failed to connect SIGNAL(newDataAvailable(int)) with SLOT(unlockProcessing(int)\n" );
+  start();
   qDebug() << "The Component " << name() << " is started";
 }
@@ -299 +301 @@
 
     // first looking for start-of-frame
-    if (!startOfFrame_ && (currentChar == '$')) { 
+    if (!startOfFrame_ && (currentChar == '$')) {
       startOfFrame_ = true;
       endOfFrame_ = false;
@@ -313 +315 @@
       return true;  // There is a new frame to decode
     }
-    
+
     if ((startOfFrame_) && (!endOfFrame_)) {
-      frameToDecode_.data.append(currentChar); 
+      frameToDecode_.data.append(currentChar);
     }
   }
@@ -325 +327 @@
 {
   // new frame available
-  semaphore_.release( v ); 
+  semaphore_.release( v );
 }
 
@@ -331 +333 @@
 int GpsComponent::decodeFrame(int type)
 {
-  double lat_rad = 0, lon_rad = 0; 
-  int indexGSV = 0; 
+  double lat_rad = 0, lon_rad = 0;
+  int indexGSV = 0;
   int indexGSA = 0;
-  
-  
-  SENTENCE sentence; 
-  sentence.Sentence = frameToDecode_.data; 
-  
-  switch(type) 
+
+
+  SENTENCE sentence;
+  sentence.Sentence = frameToDecode_.data;
+
+  switch(type)
   {
-  case UNKNOWN_NMEA_FRAME: 
-    qDebug("Unknown frame received !"); 
-    break; 
+  case UNKNOWN_NMEA_FRAME:
+    qDebug("Unknown frame received !");
+    break;
   case SIGNAL_PPS:
     ppsFrame.setRoadTime(lastPpsTime_);
@@ -351 +353 @@
     {
                 if (!(ppshdFile.isOpen()))
-        ppshdFile.open((char *)(name() + "_pps.dbt").toLatin1().data(),WriteMode,TYPE_INT,sizeof(int)); 
+        ppshdFile.open((char *)(name() + "_pps.dbt").toLatin1().data(),WriteMode,TYPE_INT,sizeof(int));
     if ( ppshdFile.writeRecord(frameToDecode_.t,frameToDecode_.tr,(char *) ppsFrame.getFrameData(),sizeof(int)) == 0)
-        qWarning("Failed to record PPS data ...\n");   
+        qWarning("Failed to record PPS data ...\n");
     }
     ppsFrame.notifyObservers();
 
     break;
-    
-  case TRAME_GGA_DBL:    
+
+  case TRAME_GGA_DBL:
     if (!nmea0183_.Gga.Parse(sentence)) {
       LOG_ERROR("Failed to parse the frame " << nmea0183_.Gga.ErrorMessage.toLatin1().data());
@@ -377 +379 @@
       ggaFrame.getFrameData()->d_geoidal = nmea0183_.Gga.GeoidalSeparationMeters;
       ggaFrame.getFrameData()->age = nmea0183_.Gga.AgeOfDifferentialGPSDataSeconds;
-      ggaFrame.getFrameData()->dir_lat = ( (nmea0183_.Gga.Position.Latitude.Northing == North) ? 'N' : 'S' ); 
-      ggaFrame.getFrameData()->dir_lon = ( (nmea0183_.Gga.Position.Longitude.Easting == East) ? 'E' : 'W' ); 
-      ggaFrame.getFrameData()->ref_station_ID = nmea0183_.Gga.DifferentialReferenceStationID; 
+      ggaFrame.getFrameData()->dir_lat = ( (nmea0183_.Gga.Position.Latitude.Northing == North) ? 'N' : 'S' );
+      ggaFrame.getFrameData()->dir_lon = ( (nmea0183_.Gga.Position.Longitude.Easting == East) ? 'E' : 'W' );
+      ggaFrame.getFrameData()->ref_station_ID = nmea0183_.Gga.DifferentialReferenceStationID;
       ggaFrame.setRoadTime(frameToDecode_.t);
-      
-      sendDataToServerSocket(*ggaFrame.getFrameData(),type); 
+
+      sendDataToServerSocket(*ggaFrame.getFrameData(),type);
       ggaFrame.notifyObservers();
 
       if ( (isRecording()) && (ggaRecording) ) {
                     if (!(ggahdFile.isOpen()))
-                ggahdFile.open((char *)(name() + "_gga.dbt").toLatin1().data(),WriteMode,TRAME_GGA_DBL,sizeof(trame_gga_dbl)); 
-                    if ( !ggahdFile.writeRecord(frameToDecode_.t,frameToDecode_.tr,(char *) ggaFrame.getFrameData(),sizeof(trame_gga_dbl))) 
-          qWarning("Failed to record GGA data ...\n"); 
+                ggahdFile.open((char *)(name() + "_gga.dbt").toLatin1().data(),WriteMode,TRAME_GGA_DBL,sizeof(trame_gga_dbl));
+                    if ( !ggahdFile.writeRecord(frameToDecode_.t,frameToDecode_.tr,(char *) ggaFrame.getFrameData(),sizeof(trame_gga_dbl)))
+          qWarning("Failed to record GGA data ...\n");
       }
       //printf("lon=%f lat=%f\n",ggaFrame.getFrameData()->lon, ggaFrame.getFrameData()->lat);
     }
     break;
-    
+
   case TRAME_GSA:
     if (!nmea0183_.Gsa.Parse(sentence))
@@ -401 +403 @@
     gsaFrame.getFrameData()->mode_result = 0;
     if (nmea0183_.Gsa.FixMode == GSA::FixUnavailable)
-      gsaFrame.getFrameData()->mode_result = 1; 
+      gsaFrame.getFrameData()->mode_result = 1;
     if (nmea0183_.Gsa.FixMode == GSA::TwoDimensional)
-      gsaFrame.getFrameData()->mode_result = 2; 
+      gsaFrame.getFrameData()->mode_result = 2;
     if (nmea0183_.Gsa.FixMode == GSA::ThreeDimensional)
-      gsaFrame.getFrameData()->mode_result = 3; 
+      gsaFrame.getFrameData()->mode_result = 3;
     for (indexGSA = 0 ; indexGSA<12 ; indexGSA++)
-      gsaFrame.getFrameData()->SV_PRN[indexGSA] = nmea0183_.Gsa.SatelliteNumber[indexGSA]; 
-    gsaFrame.getFrameData()->pdop = nmea0183_.Gsa.PDOP; 
-    gsaFrame.getFrameData()->hdop = nmea0183_.Gsa.HDOP; 
-    gsaFrame.getFrameData()->vdop = nmea0183_.Gsa.VDOP; 
+      gsaFrame.getFrameData()->SV_PRN[indexGSA] = nmea0183_.Gsa.SatelliteNumber[indexGSA];
+    gsaFrame.getFrameData()->pdop = nmea0183_.Gsa.PDOP;
+    gsaFrame.getFrameData()->hdop = nmea0183_.Gsa.HDOP;
+    gsaFrame.getFrameData()->vdop = nmea0183_.Gsa.VDOP;
     gsaFrame.setRoadTime(frameToDecode_.t);
 
     gsaFrame.notifyObservers();
-    
-    sendDataToServerSocket(*gsaFrame.getFrameData(),type); 
-    
+
+    sendDataToServerSocket(*gsaFrame.getFrameData(),type);
+
     if ( (isRecording()) && (gsaRecording) )
     {
                 if (!(gsahdFile.isOpen()))
                   gsahdFile.open((char *)(name() + "_gsa.dbt").toLatin1().data(),WriteMode, TRAME_GSA,sizeof(trame_gsa));
-                if ( gsahdFile.writeRecord(frameToDecode_.t, frameToDecode_.tr,(char *) gsaFrame.getFrameData(),sizeof(trame_gsa)) != 1) 
-        qWarning("Failed to record GSA data ...\n"); 
+                if ( gsahdFile.writeRecord(frameToDecode_.t, frameToDecode_.tr,(char *) gsaFrame.getFrameData(),sizeof(trame_gsa)) != 1)
+        qWarning("Failed to record GSA data ...\n");
     }
     break;
 
 
-    
+
   case TRAME_GST:
     if (!nmea0183_.Gst.Parse( sentence ))
@@ -443 +445 @@
     gstFrame.getFrameData()->Ms = nmea0183_.Gst.Time.time().msec();
     gstFrame.setRoadTime(frameToDecode_.t);
-    
-    sendDataToServerSocket(*gstFrame.getFrameData(),type); 
+
+    sendDataToServerSocket(*gstFrame.getFrameData(),type);
     gstFrame.notifyObservers();
 
 
     if ( (isRecording()) && (gstRecording) ) {
-                  if (!gsthdFile.isOpen())      
-                          gsthdFile.open((char *)(name() + "_gst.dbt").toLatin1().data(),WriteMode,TRAME_GST,sizeof(trame_gst)); 
+                  if (!gsthdFile.isOpen())
+                          gsthdFile.open((char *)(name() + "_gst.dbt").toLatin1().data(),WriteMode,TRAME_GST,sizeof(trame_gst));
       if ( !gsthdFile.writeRecord(frameToDecode_.t, frameToDecode_.tr,(char *) gstFrame.getFrameData(),sizeof(trame_gst)) )
-        qWarning("Failed to record GST data ...\n"); 
-    }
-    break; 
-    
+        qWarning("Failed to record GST data ...\n");
+    }
+    break;
+
   case TRAME_GSV:
     indexGSV = 0;
@@ -462 +464 @@
       break;
     }
-    // it's a new frame, reset stored value in case of the number of satellites 
+    // it's a new frame, reset stored value in case of the number of satellites
     // in view has decreased
     if (nmea0183_.Gsv.message_number == 1)
@@ -477 +479 @@
     gsvFrame.getFrameData()->NumberOfSatellites = nmea0183_.Gsv.NumberOfSatellites;
     gsvFrame.getFrameData()->Totalmessages = nmea0183_.Gsv.Totalmessages;
-    
+
     for  ( indexGSV=4*(nmea0183_.Gsv.message_number-1); indexGSV<=(4*nmea0183_.Gsv.message_number)-1; indexGSV++ )
     {
@@ -487 +489 @@
 
     if (nmea0183_.Gsv.Totalmessages == nmea0183_.Gsv.message_number) {
-      sendDataToServerSocket(*gsvFrame.getFrameData(),type); 
+      sendDataToServerSocket(*gsvFrame.getFrameData(),type);
       gsvFrame.setRoadTime(frameToDecode_.t);
       gsvFrame.notifyObservers();
@@ -493 +495 @@
     if ( (isRecording()) && (gsvRecording) && (nmea0183_.Gsv.Totalmessages == nmea0183_.Gsv.message_number) )
     {
-                if (!gsvhdFile.isOpen())      
-        gsvhdFile.open((char *)(name() + "_gsv.dbt").toLatin1().data(),WriteMode,TRAME_GSV,sizeof(trame_gsv)); 
+                if (!gsvhdFile.isOpen())
+        gsvhdFile.open((char *)(name() + "_gsv.dbt").toLatin1().data(),WriteMode,TRAME_GSV,sizeof(trame_gsv));
                 if ( gsvhdFile.writeRecord(frameToDecode_.t, frameToDecode_.tr,(char *) gsvFrame.getFrameData(),sizeof(trame_gsv)) == 0)
-        qWarning("Failed to record GSV data ...\n"); 
-    }
-    break; 
-    
+        qWarning("Failed to record GSV data ...\n");
+    }
+    break;
+
     case TRAME_HDT:
       if (!nmea0183_.Hdt.Parse( sentence ))
@@ -505 +507 @@
       hdtFrame.getFrameData()->DegreesTrue = nmea0183_.Hdt.DegreesTrue;
       hdtFrame.setRoadTime(frameToDecode_.t);
-      
-      sendDataToServerSocket(hdtFrame,type); 
+
+      sendDataToServerSocket(hdtFrame,type);
       hdtFrame.notifyObservers();
-      
+
       if ( (isRecording()) && (hdtRecording) )
       {
                   if (!hdthdFile.isOpen())
-                          hdthdFile.open((char *)(name() + "_hdt.dbt").toLatin1().data(),WriteMode,TRAME_HDT,sizeof(trame_hdt)); 
+                          hdthdFile.open((char *)(name() + "_hdt.dbt").toLatin1().data(),WriteMode,TRAME_HDT,sizeof(trame_hdt));
       if ( hdthdFile.writeRecord(frameToDecode_.t, frameToDecode_.tr,(char *) hdtFrame.getFrameData(),sizeof(trame_hdt)) == 0)
-          qWarning("Failed to record HDT data ...\n"); 
-      }
-      break; 
-      
+          qWarning("Failed to record HDT data ...\n");
+      }
+      break;
+
     case TRAME_RMC:
       if (!nmea0183_.Rmc.Parse( sentence ))
@@ -545 +547 @@
       rmcFrame.getFrameData()->vitesse = nmea0183_.Rmc.SpeedOverGroundKnots * 1852.0 / 3600.0; // 1 knot = 1852 m/h
       rmcFrame.setRoadTime(frameToDecode_.t);
-      
-      sendDataToServerSocket(*rmcFrame.getFrameData(),type); 
+
+      sendDataToServerSocket(*rmcFrame.getFrameData(),type);
       rmcFrame.notifyObservers();
-      
+
       if ( (isRecording()) && (rmcRecording) )
       {
         if (!rmchdFile.isOpen())
-          rmchdFile.open((char *)(name() + "_rmc.dbt").toLatin1().data(),WriteMode,TRAME_RMC,sizeof(trame_rmc)); 
+          rmchdFile.open((char *)(name() + "_rmc.dbt").toLatin1().data(),WriteMode,TRAME_RMC,sizeof(trame_rmc));
         if (rmchdFile.writeRecord(frameToDecode_.t ,frameToDecode_.tr,(char *) rmcFrame.getFrameData(),sizeof(trame_rmc)) == 0)
-          qWarning("Failed to record RMC data ...\n"); 
+          qWarning("Failed to record RMC data ...\n");
       }
       break;
-      
+
     case TRAME_ROT:
       if (!nmea0183_.Rot.Parse( sentence ))
@@ -564 +566 @@
       rotFrame.getFrameData()->valid_data = ( (nmea0183_.Rot.IsDataValid == True) ? 1 : 0 );
       rotFrame.setRoadTime(frameToDecode_.t);
-      
-      sendDataToServerSocket(*rotFrame.getFrameData(),type); 
+
+      sendDataToServerSocket(*rotFrame.getFrameData(),type);
       rotFrame.notifyObservers();
-      
+
       if ( (isRecording()) && (rotRecording) )
       {
         if (!rothdFile.isOpen())
-          rothdFile.open((char *)(name() + "_rot.dbt").toLatin1().data(),WriteMode,TRAME_ROT,sizeof(trame_rot)); 
+          rothdFile.open((char *)(name() + "_rot.dbt").toLatin1().data(),WriteMode,TRAME_ROT,sizeof(trame_rot));
         if ( rothdFile.writeRecord(frameToDecode_.t ,frameToDecode_.tr,(char *) rotFrame.getFrameData(),sizeof(trame_rot)) == 0)
-          qWarning("Failed to record ROT data ...\n"); 
-      }
-      break; 
-      
+          qWarning("Failed to record ROT data ...\n");
+      }
+      break;
+
     case TRAME_VTG:
       if (!nmea0183_.Vtg.Parse( sentence )) {
@@ -582 +584 @@
       } else {
         vtgFrame.getFrameData()->v = nmea0183_.Vtg.SpeedKilometersPerHour;
-        vtgFrame.getFrameData()->track_true_north = nmea0183_.Vtg.TrackDegreesTrue; 
-        vtgFrame.getFrameData()->track_magnet_north = nmea0183_.Vtg.TrackDegreesMagnetic; 
+        vtgFrame.getFrameData()->track_true_north = nmea0183_.Vtg.TrackDegreesTrue;
+        vtgFrame.getFrameData()->track_magnet_north = nmea0183_.Vtg.TrackDegreesMagnetic;
         vtgFrame.setRoadTime(frameToDecode_.t);
-      
+
         sendDataToServerSocket(vtgFrame,type);
         vtgFrame.notifyObservers();
-      
+
         if (isRecording() && vtgRecording) {
-          if (!vtghdFile.isOpen()) 
-            vtghdFile.open((char *)(name() + "_vtg.dbt").toLatin1().data(),WriteMode,TRAME_VTG,sizeof(trame_vtg)); 
+          if (!vtghdFile.isOpen())
+            vtghdFile.open((char *)(name() + "_vtg.dbt").toLatin1().data(),WriteMode,TRAME_VTG,sizeof(trame_vtg));
                       if ( vtghdFile.writeRecord(frameToDecode_.t, frameToDecode_.tr,(char *) vtgFrame.getFrameData(),sizeof(trame_vtg)) == 0)
-            qWarning("Failed to record VTG data ...\n"); 
+            qWarning("Failed to record VTG data ...\n");
         }
       }
-      break; 
-      
+      break;
+
     case TRAME_ZDA:
       if (!nmea0183_.Zda.Parse( sentence )) {
@@ -609 +611 @@
       zdaFrame.getFrameData()->MM = nmea0183_.Zda.Time.date().month();
       zdaFrame.getFrameData()->JJ = nmea0183_.Zda.Time.date().day();
-      zdaFrame.getFrameData()->H_offset = nmea0183_.Zda.LocalHourDeviation; 
-      zdaFrame.getFrameData()->Mi_offset = nmea0183_.Zda.LocalMinutesDeviation; 
-      
+      zdaFrame.getFrameData()->H_offset = nmea0183_.Zda.LocalHourDeviation;
+      zdaFrame.getFrameData()->Mi_offset = nmea0183_.Zda.LocalMinutesDeviation;
+
       sendDataToServerSocket(*zdaFrame.getFrameData(), type);
       zdaFrame.setRoadTime(frameToDecode_.t);
       zdaFrame.notifyObservers();
-      
+
       if ( (isRecording()) && (zdaRecording) ) {
-                  if (!zdahdFile.isOpen()) 
-          zdahdFile.open((char *)(name() + "_zda.dbt").toLatin1().data(),WriteMode,TRAME_ZDA,sizeof(trame_zda)); 
+                  if (!zdahdFile.isOpen())
+          zdahdFile.open((char *)(name() + "_zda.dbt").toLatin1().data(),WriteMode,TRAME_ZDA,sizeof(trame_zda));
       if ( zdahdFile.writeRecord(frameToDecode_.t, frameToDecode_.tr,(char *) zdaFrame.getFrameData(),sizeof(trame_zda)) == 0) {
             LOG_WARN("Failed to record ZDA data ...");
@@ -641 +643 @@
       }
       */
-      
-      break; 
-      
+
+      break;
+
     default:
-      return 0; 
+      return 0;
   }
-  
-  return 1; 
+
+  return 1;
 }
 

trunk/Gps/gpsComponent.h

@@ -21 +21 @@
 #include <QSemaphore>
 #include <QThread>
+#include <QByteArray>
+#include <QString>
 
 #ifdef WIN32
 #   include "../driver/win32SerialPort.h"
 //#   include "network/gpsServerSocket.h"
-#else 
+#else
 #   include "../driver/PosixSerialPort.h"
 #endif
@@ -41 +43 @@
 #   endif
 #else
-    // On other platforms, simply ignore this 
+    // On other platforms, simply ignore this
 #   define GPS_API /* nothing */
 #endif
@@ -58 +60 @@
 {
   Q_OBJECT
-    
+
 public:
-  GpsComponent(QString name); 
-  ~GpsComponent(); 
-  
+  GpsComponent(QString name);
+  ~GpsComponent();
+
   virtual void stopActivity(); /*!< to stop the processing thread */
   virtual void startActivity(); /*!< to start the processing thread */
-  virtual ComponentBase::COMPONENT_CONFIGURATION configureComponent(XmlComponentConfig config); 
+  virtual ComponentBase::COMPONENT_CONFIGURATION configureComponent(XmlComponentConfig config);
 
 
@@ -71 +73 @@
   void disableSocketServer(); /*!< to disable the socket server interface */
 
-  void setPortCOM(const char * port); 
+  void setPortCOM(const char * port);
 
 
-  
-public slots: 
+
+public slots:
   void unlockProcessing(int v); /*!< to unlock the processing thread */
 
 protected:
 private:
-  void run(); /*!< the main loop of the thread */ 
-  int frameType(const QByteArray& frame); /*!< to get the type of the frame */ 
-  int decodeFrame(int type); /*!< parse the string in the NMEA0183 class to get the frame informations */ 
+  void run(); /*!< the main loop of the thread */
+  int frameType(const QByteArray& frame); /*!< to get the type of the frame */
+  int decodeFrame(int type); /*!< parse the string in the NMEA0183 class to get the frame informations */
   bool currentFrameIsPps(); /*!< checks if a frame is an out-of-band pps signal */
-  bool analyzeFrame(); /*!< reconstruct the entire frame starting from the received pieces */ 
+  bool analyzeFrame(); /*!< reconstruct the entire frame starting from the received pieces */
 
 #ifdef WIN32
@@ -104 +106 @@
   static FrameTypeMap frameTypes[MAX_FRAMES];
 
-  NMEA0183 nmea0183_; 
-  QSemaphore semaphore_; 
+  NMEA0183 nmea0183_;
+  QSemaphore semaphore_;
 
-  FRAME* currentFrame_; 
+  FRAME* currentFrame_;
 
-  FRAME frameToDecode_; 
+  FRAME frameToDecode_;
 
   road_time_t lastPpsTime_;
 
-  bool newFrameToDecode_; 
-  bool startOfFrame_; 
-  bool endOfFrame_; 
+  bool newFrameToDecode_;
+  bool startOfFrame_;
+  bool endOfFrame_;
   int nextByteToProcess_;
 
 
   unsigned int ppsIndex_;
-  
+
   DbiteFile ppshdFile; /*!< pointer to the pps dbt file */
   DbiteFile ggahdFile; /*!< pointer to the gga dbt file */
@@ -139 +141 @@
   bool ggaRecording;
   bool gsaRecording;
-  bool gstRecording; 
+  bool gstRecording;
   bool gsvRecording;
   bool hdtRecording;
-  bool rmcRecording; 
-  bool rotRecording; 
-  bool vtgRecording; 
-  bool zdaRecording; 
-  
-  QString portName_; 
+  bool rmcRecording;
+  bool rotRecording;
+  bool vtgRecording;
+  bool zdaRecording;
+
+  QString portName_;
 
   ShMem * shMem_;
-  
+
   /// For the socket server
   /* Qt3 version - 17/12/2007
-  BOOL socketServerEnabled; 
-  void *frameToSend; 
+  BOOL socketServerEnabled;
+  void *frameToSend;
   QCustomEvent *evt;
   */
-  
-  /* 
-  * VC6 doesn't support out-of-class template defintions 
-  * see on http://support.microsoft.com kb q243451 and more particulary 241949 
+
+  /*
+  * VC6 doesn't support out-of-class template defintions
+  * see on http://support.microsoft.com kb q243451 and more particulary 241949
   */
   template<typename T>
@@ -168 +170 @@
     if (socketServerEnabled)
     {
-      frameToSend = new T; 
-      *(T*)frameToSend = frame; 
-      evt = new QCustomEvent(QEvent::User + type); 
-      evt->setData(frameToSend); 
-      postEvent(serverSocket,evt); 
+      frameToSend = new T;
+      *(T*)frameToSend = frame;
+      evt = new QCustomEvent(QEvent::User + type);
+      evt->setData(frameToSend);
+      postEvent(serverSocket,evt);
     }
     */

trunk/Gps/ui/polarxmainwindow.cpp

@@ -362 +362 @@
     }
 }
-
+/*
 void PolarxMainWindow::setReceiverStatus( SbfDataReceiverStatus * msg )
 {
@@ -479 +479 @@
     }
 }
+*/

trunk/Gps/ui/polarxmainwindow.hpp

@@ -2 +2 @@
 #define __POLARXMAINWINDOW__
 
-#include <QtGui>
+//#include <QtGui>
+#include <QtWidgets>
 #include <bitset>
-#include "structure/structure_septentrio.h"
+#include "../structure_gps.h"
 #include "../SeptentrioSocket.h"
 #include "PacpusTools/BinaryDecoder.h"
@@ -17 +18 @@
 
       void setData( unsigned char * data , int buf_size ) ;
-      void setReceiverStatus( SbfDataReceiverStatus * msg ) ;
+      /*void setReceiverStatus( SbfDataReceiverStatus * msg ) ;
       void setTrackingStatus( SbfDataTrackingStatus * msg ) ;
-      void setPVTGeodetic( SbfDataPVTGeodetic * msg ) ;
+      void setPVTGeodetic( SbfDataPVTGeodetic * msg ) ;*/
       void setSocket( SeptentrioSocket * socket ) ;
 

trunk/Ladybug/LadybugComponent.cpp

@@ -32 +32 @@
 // Construct the factory
 static ComponentFactory<LadybugComponent> sFactory("LadybugComponent");
-static const size_t kMaxFilepathLength = 128;
 
 /* *Constructor*/
@@ -57 +56 @@
         lbTotalNumberOfImagesWritten = 0;
         lbNumOfFrames = 0;
-
-        if (lbSaveJPGImages)
-        {
-                try 
-                {
-                        QString dbtFileName_ = "Camera_1.dbt";
-                        mDbtImage1.open(dbtFileName_.toStdString(), WriteMode, FILE_DBT_UNKNOWN, kMaxFilepathLength);
-                } catch (DbiteException & e) {
-                        LOG_ERROR("error opening dbt file: " << e.what());
-                }
-
-                try 
-                {
-                        QString dbtFileName_ = "Camera_2.dbt";
-                        mDbtImage1.open(dbtFileName_.toStdString(), WriteMode, FILE_DBT_UNKNOWN, kMaxFilepathLength);
-                } catch (DbiteException & e) {
-                        LOG_ERROR("error opening dbt file: " << e.what());
-                }
-
-                try 
-                {
-                        QString dbtFileName_ = "Camera_3.dbt";
-                        mDbtImage1.open(dbtFileName_.toStdString(), WriteMode, FILE_DBT_UNKNOWN, kMaxFilepathLength);
-                } catch (DbiteException & e) {
-                        LOG_ERROR("error opening dbt file: " << e.what());
-                }
-
-                try 
-                {
-                        QString dbtFileName_ = "Camera_4.dbt";
-                        mDbtImage1.open(dbtFileName_.toStdString(), WriteMode, FILE_DBT_UNKNOWN, kMaxFilepathLength);
-                } catch (DbiteException & e) {
-                        LOG_ERROR("error opening dbt file: " << e.what());
-                }
-
-                try 
-                {
-                        QString dbtFileName_ = "Camera_5.dbt";
-                        mDbtImage1.open(dbtFileName_.toStdString(), WriteMode, FILE_DBT_UNKNOWN, kMaxFilepathLength);
-                } catch (DbiteException & e) {
-                        LOG_ERROR("error opening dbt file: " << e.what());
-                }
-
-                try 
-                {
-                        QString dbtFileName_ = "Camera_6.dbt";
-                        mDbtImage1.open(dbtFileName_.toStdString(), WriteMode, FILE_DBT_UNKNOWN, kMaxFilepathLength);
-                } catch (DbiteException & e) {
-                        LOG_ERROR("error opening dbt file: " << e.what());
-                }
-    }
-
-        if (lbSavePanoImage)
-        {
-                try 
-                {
-                        QString dbtFileName_ = "CameraPano.dbt";
-                        mDbtImage1.open(dbtFileName_.toStdString(), WriteMode, FILE_DBT_UNKNOWN, kMaxFilepathLength);
-                } catch (DbiteException & e) {
-                        LOG_ERROR("error opening dbt file: " << e.what());
-                }
-    }
-
         THREAD_ALIVE = true;
         start();
@@ -130 +66 @@
         printf (" \n*** Stopping Activity ***\n");
         LadybugError error;
-
-            // Close DBT files
-    if (lbSaveJPGImages) {
-                mDbtImage1.close();
-                mDbtImage2.close();
-                mDbtImage3.close();
-                mDbtImage4.close();
-                mDbtImage5.close();
-                mDbtImage6.close();
-    }
-
-        if (lbSavePanoImage) {
-                mDbtImagePano.close();
-        }
 
         lbIsRecording = false;
@@ -222 +144 @@
         CreateImageBuffers();
 
-        // Timestamp
-    road_time_t timestamp = 0;
-    road_timerange_t tr = 0;
-
         while (THREAD_ALIVE)
         {
-
                 lbCurrentTime = GetTickCount(); // road_time_t timestamp = road_time(); // ui64 ; unit microsec ; Orig 01/01/1970 00:00
                 lbFrameCount++;
@@ -241 +158 @@
 
                 error = ladybugGrabImage( lbContext, &image );
-                timestamp = road_time(); // timestamp 
+                // t = road_time(); // timestamp 
                 HandleError(error);
 
@@ -328 +245 @@
         HandleError(error);
 
-
-        // Use it to trigger the camera with the gps signal
         /*// Initialize Trigger
         error = ladybugGetTriggerModeInfo( lbContext, &triggerModeInfo );
@@ -441 +356 @@
                 HandleError(error);
 
-        if (uiCamera == 0)
-                {
-                        try {
-                                mDbtImage1.writeRecord(time, tr, (char *) processedImage.pData, kMaxFilepathLength);
-                        } catch (DbiteException & e) {
-                                LOG_ERROR("error writing data: " << e.what());
-                        }
-                } else if (uiCamera == 1) {
-                        try {
-                                mDbtImage2.writeRecord(time, tr, (char *) processedImage.pData, kMaxFilepathLength);
-                        } catch (DbiteException & e) {
-                                LOG_ERROR("error writing data: " << e.what());
-                        }
-                }else if (uiCamera == 2) {
-                        try {
-                                mDbtImage3.writeRecord(time, tr, (char *) processedImage.pData, kMaxFilepathLength);
-                        } catch (DbiteException & e) {
-                                LOG_ERROR("error writing data: " << e.what());
-                        }
-                }else if (uiCamera == 3) {
-                        try {
-                                mDbtImage4.writeRecord(time, tr, (char *) processedImage.pData, kMaxFilepathLength);
-                        } catch (DbiteException & e) {
-                                LOG_ERROR("error writing data: " << e.what());
-                        }
-                }else if (uiCamera == 4) {
-                        try {
-                                mDbtImage5.writeRecord(time, tr, (char *) processedImage.pData, kMaxFilepathLength);
-                        } catch (DbiteException & e) {
-                                LOG_ERROR("error writing data: " << e.what());
-                        }
-                }else if (uiCamera == 5) {
-                        try {
-                                mDbtImage6.writeRecord(time, tr, (char *) processedImage.pData, kMaxFilepathLength);
-                        } catch (DbiteException & e) {
-                                LOG_ERROR("error writing data: " << e.what());
-                        }
-                }
-
                 //printf("Saved camera %u image to %s.\n", uiCamera, pszOutputFilePath);
 
@@ -525 +401 @@
         error = ladybugSaveImage(lbContext, &processedImage, pszOutputFilePath, LADYBUG_FILEFORMAT_JPG); 
         HandleError(error);
-
-        try {
-                mDbtImagePano.writeRecord(time, tr, (char *) processedImage.pData, kMaxFilepathLength);
-        } catch (DbiteException & e) {
-                LOG_ERROR("error writing data: " << e.what());
-        }
 
 }

trunk/Ladybug/LadybugComponent.h

@@ -4 +4 @@
 //#include "Pacpus/kernel/pacpus.h"
 #include "Pacpus/kernel/ComponentBase.h"
-#include "Pacpus/kernel/DbiteFile.h"
+//#include "Pacpus/kernel/DbiteFile.h"
 //#include "../NMEA0183/include/nmea0183.h"
 
@@ -121 +121 @@
                                 int lbNumOfFrames;
 
-                                DbiteFile mDbtImage1;
-                                DbiteFile mDbtImage2;
-                                DbiteFile mDbtImage3;
-                                DbiteFile mDbtImage4;
-                                DbiteFile mDbtImage5;
-                                DbiteFile mDbtImage6;
-                                DbiteFile mDbtImagePano;
-
         };
 }

trunk/NMEA0183/CMakeLists.txt

@@ -1 +1 @@
 project(NMEA0183LIB)
 
-find_package(Qt4 REQUIRED)
-include(${QT_USE_FILE})
-include_directories(${QT_INCLUDE_DIR})
-link_directories (${QT_LIBRARIES})
+#find_package(Qt4 REQUIRED)
+#include(${QT_USE_FILE})
+
 add_definitions(${QT_DEFINITIONS}) 
+#link_directories (${QT_LIBRARIES})
 
-include_directories(include)
+include_directories(
+                    ${QT_INCLUDE_DIR}
+                    include/
+                   )
 
 #protocole de la centrale IXSEA

trunk/NMEA0183/include/HSATIT.hpp

@@ -5 +5 @@
 #include "qstring.h"
 #include "NMEA0183_slim.h"
+#include "nmea0183.h"
 #include "LatLong.hpp"
 #include "Sentence.hpp"

trunk/NMEA0183/include/NMEA0183_slim.h

@@ -17 +17 @@
 
 /*
-** Updates : Maria Alwan & G�rald Dherbomez  
+** Updates : Maria Alwan & G�rald Dherbomez
 ** Date :    14/09/2005
 ** purpose : use of Qt API instead of MFC
@@ -32 +32 @@
 #include <QString>
 #include <QVector>
-#include <QDateTime> 
+#include <QDateTime>
 
 
@@ -137 +137 @@
 #endif
 
+#ifndef TRUE
+#define TRUE true
+#endif
+
+#ifndef FALSE
+#define FALSE false
+#endif
 //#include "nmea0183.hpp"
 

trunk/NMEA0183/include/nmea0183.h

@@ -137 +137 @@
 #endif
 
+#ifndef TRUE
+#define TRUE true
+#endif
+
+#ifndef FALSE
+#define FALSE false
+#endif
+
 #include "nmea0183.hpp"
 

trunk/NMEA0183/src/HSATIT.cpp

@@ -1 +1 @@
 #include "HSATIT.hpp"
-
+#include "nmea0183.h"
 
 
@@ -19 +19 @@
 {
 
-        
-    heading                             = 0.0;  
-        roll                            = 0.0;  
-        pitch                           = 0.0;  
-        heave                           = 0.0;  
-        yawRotationRate         = 0.0;          
-        rollRotationRate        = 0.0;  
+
+    heading                             = 0.0;
+        roll                            = 0.0;
+        pitch                           = 0.0;
+        heave                           = 0.0;
+        yawRotationRate         = 0.0;
+        rollRotationRate        = 0.0;
         pitchRotationRate       = 0.0;
-        courseMadeGood          = 0.0;          
+        courseMadeGood          = 0.0;
         speedOverGround         = 0.0;
-        longitudinalVel         = 0.0;          
+        longitudinalVel         = 0.0;
         transveralVel           = 0.0;
         verticalVel                     = 0.0;
@@ -43 +43 @@
 {
    /*
-   ** HSATIT 
+   ** HSATIT
    **
    **               1     2     3     4   5     6     7     8     9    10    11    12    13   14   15   16   17   18
@@ -49 +49 @@
    ** $HSATIT,h.hhh,r.rrr,p.ppp,h.h,a.aaa,b.bbb,c.ccc,d.ddd,e.eee,f.fff,g.ggg,h.hhh,i.ii,j.jj,k.kk,l.ll,m.mm,n.nn<CR><LF>
    **
-   ** Field Number: 
+   ** Field Number:
    **   1)  h.hhh               is the heading in deg
                 2)  r.rrr               is the roll in deg
@@ -68 +68 @@
                 17) m.mm                is the east speed Std in m/s
                 18) n.nn                is the vertical speed Std in m/s
-                
-                
+
+
    */
 
-    heading                             = sentence.Double( 1 ); 
-        roll                            = sentence.Double( 2 ); 
-        pitch                           = sentence.Double( 3 ); 
-        heave                           = sentence.Double( 4 ); 
-        yawRotationRate         = sentence.Double( 5 );         
-        rollRotationRate        = sentence.Double( 6 ); 
+    heading                             = sentence.Double( 1 );
+        roll                            = sentence.Double( 2 );
+        pitch                           = sentence.Double( 3 );
+        heave                           = sentence.Double( 4 );
+        yawRotationRate         = sentence.Double( 5 );
+        rollRotationRate        = sentence.Double( 6 );
         pitchRotationRate       = sentence.Double( 7 );
-        courseMadeGood          = sentence.Double( 8 );         
+        courseMadeGood          = sentence.Double( 8 );
         speedOverGround         = sentence.Double( 9 );
-        longitudinalVel         = sentence.Double( 10 );                
+        longitudinalVel         = sentence.Double( 10 );
         transveralVel           = sentence.Double( 11 );
         verticalVel                     = sentence.Double( 12 );
@@ -89 +89 @@
         northSpeedStdDev        = sentence.Double( 16 );
         eastSpeeedStdDev        = sentence.Double( 17 );
-        verticalStdDev          = sentence.Double( 18 ); 
+        verticalStdDev          = sentence.Double( 18 );
 
    return( TRUE );
@@ -108 +108 @@
    ** Let the parent do its thing
    */
-   
+
    RESPONSE::Write( sentence );
 
@@ -115 +115 @@
         sentence += pitch;
         sentence += sentence += sentence += heave;
-        sentence += yawRotationRate;            
-        sentence += rollRotationRate;   
+        sentence += yawRotationRate;
+        sentence += rollRotationRate;
         sentence += pitchRotationRate;
-        sentence += courseMadeGood;             
+        sentence += courseMadeGood;
         sentence += speedOverGround;
-        sentence += longitudinalVel;            
+        sentence += longitudinalVel;
         sentence += transveralVel;
         sentence += verticalVel;
@@ -128 +128 @@
         sentence += sentence += northSpeedStdDev;
         sentence += eastSpeeedStdDev;
-        sentence += verticalStdDev; 
+        sentence += verticalStdDev;
 
    sentence.Finish();
@@ -138 +138 @@
 {
 
-    heading                             = source.heading;       
-        roll                            = source.roll;  
-        pitch                           = source.pitch; 
-        heave                           = source.heave; 
-        yawRotationRate         = source.yawRotationRate;               
-        rollRotationRate        = source.rollRotationRate;      
+    heading                             = source.heading;
+        roll                            = source.roll;
+        pitch                           = source.pitch;
+        heave                           = source.heave;
+        yawRotationRate         = source.yawRotationRate;
+        rollRotationRate        = source.rollRotationRate;
         pitchRotationRate       = source.pitchRotationRate;
-        courseMadeGood          = source.courseMadeGood;                
+        courseMadeGood          = source.courseMadeGood;
         speedOverGround         = source.speedOverGround;
-        longitudinalVel         = source.longitudinalVel;               
+        longitudinalVel         = source.longitudinalVel;
         transveralVel           = source.transveralVel;
         verticalVel                     = source.verticalVel;

trunk/OpencvVideo/CMakeLists.txt

@@ +1 @@
+#########################quick start############################################
+# cmake ../ -G "CodeBlocks - Unix Makefiles"
+# make
+# make install
+# make clean
+# sudo apt-get install libopencv-dev
+################################################################################
 project(OpencvVideo)
-################################################################################
-
+set(${PROJECT_NAME}_VERSION_MAJOR 0)
+set(${PROJECT_NAME}_VERSION_MINOR 1)
 # Create a DLL
 add_definitions(-DCVWEBCAM_COMPONENT_EXPORTS)
 add_definitions( -DVIDEO_EXPORTS )
 
+#include(FindOpenCV.cmake)
 find_package(OpenCV REQUIRED)
 
@@ -12 +20 @@
     message(FATAL_ERROR "Project ${PROJECT_NAME} requires OpenCV library")
 endif()
-
-# ========================================
-# Configure qt4
-# ========================================
-if(QT4_FOUND)
-  set(QT_USE_QTXML true)
-  set(QT_USE_QTNETWORK true)
-  include(${QT_USE_FILE})
-else()
-  message(ERROR "Qt4 needed")
-endif()
-
-# ========================================
-# Compiler definitions
-# ========================================
-add_definitions(
-  ${QT_DEFINITIONS}
-)
-
-# ========================================
-# Include directories
-# ========================================
-include_directories(
-  ${PROJECT_BINARY_DIR}
-  ${QT_INCLUDE_DIR}
+################################################################################
+create_export(EXPORT_HDR ${PROJECT_NAME})
+pacpus_plugin(PLUGIN_CPP PLUGIN_HDR ${PROJECT_NAME})
+add_definitions (${QT_DEFINITIONS})
+find_package(Qt5Network REQUIRED)
+################################################################################
+# DIRECTORIES
+include_directories( 
+    ${PROJECT_BINARY_DIR}
+    ${QT_INCLUDE_DIR}
+    ${PACPUS_INCLUDE_DIR}
+    ${PACPUS_INCLUDE_DIR}/Pacpus/
 )
 
@@ -42 +37 @@
 # Link directories
 # ========================================
-link_directories( ${PACPUS_LIB_DIR} )
+link_directories( 
+        ${PACPUS_LIB_DIR}
+)
 
-message (STATUS ${PACPUS_LIB_DIR})
 
-pacpus_plugin(PLUGIN_CPP PLUGIN_H ${PROJECT_NAME} )
+################################################################################
+# FILES
+set(PROJECT_HDRS
+    ${EXPORT_HDR}
+    CVWebcamComponent.hpp
+    WebcamWorker.hpp
+)
+set(PROJECT_SRCS
+    ${PLUGIN_CPP} 
+)
 
-# ========================================
-# List of sources
-# ========================================
-if (UNIX)
-        set(
-                PROJECT_SRCS
-                ${PLUGIN_CPP}
-        )
+if(OpenCV_FOUND)
+    list(APPEND PROJECT_SRCS CVWebcamComponent.cpp WebcamWorker.cpp)
 endif()
 
-if(WIN32) 
-        set(
-                PROJECT_SRCS
-                ${PLUGIN_CPP}
-        )
-        if(OpenCV_FOUND)
-                list(APPEND PROJECT_SRCS CVWebcamComponent.cpp WebcamWorker.cpp)
-        endif()
-endif()
-
-
-# ========================================
-# Files to MOC
-# ========================================
-set(
-    FILES_TO_MOC
-        ${PLUGIN_H}
-         CVWebcamComponent.hpp
-         WebcamWorker.hpp
+set(FILES_TO_MOC
+    ${PLUGIN_HDR}
+    CVWebcamComponent.hpp
+    WebcamWorker.hpp
 )
 
-set(
-    UI_FILES
-
+set(UI_FILES
 )
 
-# ========================================
-# Call MOC
-# ========================================
-qt4_wrap_cpp(
-    PROJECT_MOC_SRCS
+################################################################################
+# Qt: call moc, uic
+qt_wrap_cpp(PROJECT_MOC_SRCS
     ${FILES_TO_MOC}
 )
 
-qt4_wrap_ui(
-    PROJECT_UI_SRCS
+qt_wrap_ui(PROJECT_UI_SRCS
     ${UI_FILES}
 )
 
-# ========================================
-# Build a library
-# ========================================
-pacpus_add_library(
-    ${PROJECT_NAME} SHARED
+################################################################################
+# BUILD and LINK
+pacpus_add_library(${PROJECT_NAME} SHARED
+    ${PROJECT_HDRS}
     ${PROJECT_SRCS}
     ${PROJECT_MOC_SRCS}
@@ -107 +85 @@
 )
 
-message(STATUS  ${PACPUS_DEPENDENCIES_LIB} ) 
 
 # ========================================
 # Libraries
 # ========================================
-# All the platform
-target_link_libraries(
-    ${PROJECT_NAME}
-    ${PACPUS_LIBRARIES}
-    ${QT_LIBRARIES}
-        ${PACPUS_DEPENDENCIES_LIB}
-        ${OpenCV_LIBS}
-        PacpusTools
+set(LIBS
+    optimized FileLib debug FileLib_d
+    optimized PacpusLib debug PacpusLib_d
+    optimized PacpusTools debug PacpusTools_d
 )
-
-# ========================================
-# Install
-# ========================================
-pacpus_install(${PROJECT_NAME})
-
+if (WIN32)
+    list(APPEND LIBS
+        optimized ROAD_TIME debug ROAD_TIME_d
+    )
+endif()
+# LINK 
+target_link_libraries(${PROJECT_NAME} 
+                      ${PACPUS_LIBRARIES} 
+                      ${PACPUS_DEPENDENCIES_LIB} 
+                      ${LIBS}
+                      ${QT_LIBRARIES} 
+                      ${OpenCV_LIBS}
+                     )
+qt5_use_modules(${PROJECT_NAME} Network)
+################################################################################
+# FOLDERS
+pacpus_folder(${PROJECT_NAME} "components")
+################################################################################
+# INSTALL
+pacpus_install(${PROJECT_NAME}) 

trunk/PacpusSocket/CMakeLists.txt

@@ +1 @@
+#########################quick start############################################
+#cmake ../ -G "CodeBlocks - Unix Makefiles"
+#make
+#make install
+#make clean
+################################################################################
 project(PacpusSocket)
+set(${PROJECT_NAME}_VERSION_MAJOR 0)
+set(${PROJECT_NAME}_VERSION_MINOR 1)
+add_definitions( -DPACPUSSOCKET_EXPORTS ) 
 ################################################################################
-add_definitions(-DPACPUSSOCKET_EXPORTS)
+create_export(EXPORT_HDR ${PROJECT_NAME})
+pacpus_plugin(PLUGIN_CPP PLUGIN_HDR ${PROJECT_NAME})
+add_definitions (${QT_DEFINITIONS})
 
-# ========================================
-# Configure qt4
-# ========================================
-if(QT4_FOUND)
-        set(QT_USE_QTXML true)
-        set(QT_USE_QTNETWORK true)
-        include(${QT_USE_FILE})
-else()
-        message(ERROR "Qt4 needed")
-endif()
-
-# ========================================
-# Compiler definitions
-# ========================================
-add_definitions(
-        ${QT_DEFINITIONS}
-)
-
-# ========================================
-# Include directories
-# ========================================
-include_directories(
-        ${PROJECT_BINARY_DIR}
-        ${QT_INCLUDE_DIR}
+find_package(Qt5Network REQUIRED)
+################################################################################
+# DIRECTORIES
+include_directories( 
+    ${PROJECT_BINARY_DIR}
+    ${QT_INCLUDE_DIR}
+    ${PACPUS_INCLUDE_DIR}
+    ${PACPUS_INCLUDE_DIR}/Pacpus/
 )
 
@@ -32 +27 @@
 # Link directories
 # ========================================
-link_directories(
+link_directories( 
+        ${PACPUS_LIB_DIR}
 )
 
-pacpus_plugin(PLUGIN_CPP PLUGIN_H ${PROJECT_NAME} )
 
-# ========================================
-# List of sources
-# ========================================
-set(
-    PROJECT_SRCS
-    PacpusSocketAirplug.cpp
-        PacpusSocketAirplug.h
-        PacpusUDPSocket.cpp
-        PacpusUDPSocket.h
+################################################################################
+# FILES
+set(PROJECT_HDRS
+    ${EXPORT_HDR}
+    PacpusSocketAirplug.h
+    PacpusUDPSocket.h
+)
+set(PROJECT_SRCS
     ${PLUGIN_CPP}
+    PacpusSocketAirplug.cpp 
+    PacpusUDPSocket.cpp
 )
 
-# ========================================
-# Files to MOC
-# ========================================
-set(
-    FILES_TO_MOC
+set(FILES_TO_MOC
+    ${PLUGIN_HDR}
     PacpusSocketAirplug.h
-        PacpusUDPSocket.h
-    ${PLUGIN_H}
+    PacpusUDPSocket.h 
 )
 
-set(
-    UI_FILES
-
+set(UI_FILES
 )
 
-# ========================================
-# Call MOC
-# ========================================
-qt4_wrap_cpp(
-    PROJECT_MOC_SRCS
+################################################################################
+# Qt: call moc, uic
+qt_wrap_cpp(PROJECT_MOC_SRCS
     ${FILES_TO_MOC}
 )
 
-qt4_wrap_ui(
-    PROJECT_UI_SRCS
+qt_wrap_ui(PROJECT_UI_SRCS
     ${UI_FILES}
 )
 
-# ========================================
-# Build a library
-# ========================================
-pacpus_add_library(
-    ${PROJECT_NAME} SHARED
+################################################################################
+# BUILD and LINK
+pacpus_add_library(${PROJECT_NAME} SHARED
+    ${PROJECT_HDRS}
     ${PROJECT_SRCS}
     ${PROJECT_MOC_SRCS}
@@ -87 +73 @@
 )
 
+
 # ========================================
 # Libraries
 # ========================================
-# All the platform
-target_link_libraries(
-    ${PROJECT_NAME}
-    ${PACPUS_LIBRARIES}
-    ${QT_LIBRARIES}
-        ${PACPUS_DEPENDENCIES_LIB}
+set(LIBS
+    optimized FileLib debug FileLib_d
+    optimized PacpusLib debug PacpusLib_d
+    optimized PacpusTools debug PacpusTools_d
 )
+if (WIN32)
+    list(APPEND LIBS
+        optimized ROAD_TIME debug ROAD_TIME_d
+    )
+endif()
+# LINK 
+target_link_libraries(${PROJECT_NAME} 
+                      ${PACPUS_LIBRARIES} 
+                      ${PACPUS_DEPENDENCIES_LIB} 
+                      ${LIBS}
+                      ${QT_LIBRARIES} 
+                     )
+qt5_use_modules(${PROJECT_NAME} Network)
+################################################################################
+# FOLDERS
+pacpus_folder(${PROJECT_NAME} "components")
+################################################################################
+# INSTALL
+pacpus_install(${PROJECT_NAME}) 
 
-# ========================================
-# Install
-# ========================================
-pacpus_install(${PROJECT_NAME})
+install(
+    DIRECTORY   ${PacpusSocket_SOURCE_DIR}
+    DESTINATION ${PACPUS_INSTALL_DIR}/include
+    FILES_MATCHING PATTERN "*.h"
+)

trunk/PacpusSocket/PacpusUDPSocket.cpp

@@ -5 +5 @@
 //  author:     Pierre Hudelaine
 //              Copyright Heudiasyc UMR UTC/CNRS 7253
-// 
+//
 //  version:    $Id: $
 //
@@ -12 +12 @@
 *********************************************************************/
 
-#include "PacpusUDPSocket.h" 
+#include "PacpusUDPSocket.h"
 
 #include <qbuffer.h>
@@ -27 +27 @@
 // Construct the factory
 //////////////////////////////////////////////////////////////////////////
-static ComponentFactory <PacpusUDPSocket> sFactory("PacpusUDPSocket");  
+static ComponentFactory <PacpusUDPSocket> sFactory("PacpusUDPSocket");
 
 
@@ -34 +34 @@
 //////////////////////////////////////////////////////////////////////////
 PacpusUDPSocket::PacpusUDPSocket(QString name)
-    : ComponentBase(name) 
-{
-} 
+    : ComponentBase(name)
+{
+}
 
 
@@ -42 +42 @@
 // Destructor
 //////////////////////////////////////////////////////////////////////////
-PacpusUDPSocket::~PacpusUDPSocket() 
+PacpusUDPSocket::~PacpusUDPSocket()
 {
 }
@@ -52 +52 @@
 void PacpusUDPSocket::addOutputs()
 {
-        addOutput<QString, PacpusUDPSocket>("udpSocketOutput");
+        addOutput<QString, PacpusUDPSocket>("string");
 }
 
@@ -61 +61 @@
 void PacpusUDPSocket::addInputs()
 {
-        addInput<QString, PacpusUDPSocket>("udpSocketInput", &PacpusUDPSocket::sendDatagrams);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// Called by the ComponentManager to pass the XML parameters to the 
-// component 
-//////////////////////////////////////////////////////////////////////////
-ComponentBase::COMPONENT_CONFIGURATION  PacpusUDPSocket::configureComponent(XmlComponentConfig config) 
-{ 
+    addInput<QString, PacpusUDPSocket>("string", &PacpusUDPSocket::sendQString);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+// Called by the ComponentManager to pass the XML parameters to the
+// component
+//////////////////////////////////////////////////////////////////////////
+ComponentBase::COMPONENT_CONFIGURATION  PacpusUDPSocket::configureComponent(XmlComponentConfig config)
+{
 
         socketType_ = config.getProperty("typeSocket");
-        
+
         if (socketType_ == "client" || socketType_ == "Client")
         {
             address2send_.setAddress(config.getProperty("address"));
             port2send_ = config.getProperty("port").toUInt();
-            socketType_ = "client";             
+            socketType_ = "client";
         }
         else if (socketType_ == "server" || socketType_ == "Server")
@@ -92 +92 @@
             socketType_ = "client";
         }
-        
-        return ComponentBase::CONFIGURED_OK; 
-} 
+
+        return ComponentBase::CONFIGURED_OK;
+}
 
 
@@ -100 +100 @@
 // Called by the ComponentManager to start the component
 //////////////////////////////////////////////////////////////////////////
-void PacpusUDPSocket::startActivity() 
-{ 
+void PacpusUDPSocket::startActivity()
+{
         if (!(udpSocket_ = new QUdpSocket()))
                 qFatal("Failed to init UDP socket!");
-  
+
         if (socketType_ == "server")
         {
@@ -112 +112 @@
                         qWarning() << "Failed to bind socket for server on port" << port2bind_;
         }
-            
+
         connect(udpSocket_, SIGNAL(readyRead()), this, SLOT(readPendingDatagrams()));
-        
-        updSocketOutput_ = getTypedOutput<QString, PacpusUDPSocket>("udpSocketOutput");
+
+        udpSocketOutput_ = getTypedOutput<QString, PacpusUDPSocket>("string");
 }
 
@@ -122 +122 @@
 // Send datagram QString
 //////////////////////////////////////////////////////////////////////////
-void PacpusUDPSocket::sendDatagrams(QString frame) 
-{ 
+void PacpusUDPSocket::sendQString(const QString& frame)
+{
         int sent=0;
-        
+
         if (socketType_ == "client")
         {
-            if ((sent = udpSocket_->writeDatagram(frame.toLocal8Bit(), address2send_, port2send_)) == -1) 
-                        qDebug() << "Failed to send the frame: " << address2send_ << port2send_ << frame << endl; 
+            if ((sent = udpSocket_->writeDatagram(frame.toLocal8Bit(), address2send_, port2send_)) == -1)
+                        qDebug() << "Failed to send the frame: " << address2send_ << port2send_ << frame << endl;
         }
         else if (socketType_ == "server")
@@ -135 +135 @@
             for (int i = 0; i < listClients.size(); i++)
             {
-                        if ((sent = udpSocket_->writeDatagram(frame.toLocal8Bit(), listClients[i]->getAddress(), listClients[i]->getPort())) == -1) 
-                                qDebug() << "Failed to send the frame: " << listClients[i]->getAddress() << listClients[i]->getPort() << frame << endl; 
+                        if ((sent = udpSocket_->writeDatagram(frame.toLocal8Bit(), listClients[i]->getAddress(), listClients[i]->getPort())) == -1)
+                                qDebug() << "Failed to send the frame: " << listClients[i]->getAddress() << listClients[i]->getPort() << frame << endl;
             }
         }
-} 
+}
 
 
@@ -145 +145 @@
 // Send datagram QByteArray
 //////////////////////////////////////////////////////////////////////////
-void PacpusUDPSocket::sendDatagrams(QByteArray frame) 
-{ 
+void PacpusUDPSocket::sendDatagrams(QByteArray frame)
+{
         int sent=0;
-        
+
         if (socketType_ == "client")
         {
-            if ((sent = udpSocket_->writeDatagram(frame, address2send_, port2send_)) == -1) 
-                        qDebug() << "Failed to send the frame: " << address2send_ << port2send_ << frame << endl; 
+            if ((sent = udpSocket_->writeDatagram(frame, address2send_, port2send_)) == -1)
+                        qDebug() << "Failed to send the frame: " << address2send_ << port2send_ << frame << endl;
         }
         else if (socketType_ == "server")
@@ -158 +158 @@
             for (int i = 0; i < listClients.size(); i++)
             {
-                        if ((sent = udpSocket_->writeDatagram(frame, listClients[i]->getAddress(), listClients[i]->getPort())) == -1) 
-                                qDebug() << "Failed to send the frame: " << listClients[i]->getAddress() << listClients[i]->getPort() << frame << endl; 
+                        if ((sent = udpSocket_->writeDatagram(frame, listClients[i]->getAddress(), listClients[i]->getPort())) == -1)
+                                qDebug() << "Failed to send the frame: " << listClients[i]->getAddress() << listClients[i]->getPort() << frame << endl;
             }
         }
-} 
-
-
-//////////////////////////////////////////////////////////////////////////
-// Called when the socket receive a new datagram 
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+// Called when the socket receive a new datagram
 //////////////////////////////////////////////////////////////////////////
 void PacpusUDPSocket::readPendingDatagrams()
 {
-        while (udpSocket_->hasPendingDatagrams())  
-        {
-                QByteArray datagram; 
-                datagram.resize(udpSocket_->pendingDatagramSize()); 
-                QHostAddress sender; 
+        while (udpSocket_->hasPendingDatagrams())
+        {
+                QByteArray datagram;
+                datagram.resize(udpSocket_->pendingDatagramSize());
+                QHostAddress sender;
                 quint16 senderPort;
-    
+
                 if(udpSocket_->readDatagram(datagram.data(), datagram.size(),  &sender, &senderPort) != -1)
-                {                   
+                {
                     if (socketType_ == "server")
                     {
                                 bool flag = false;
-                
-                                for (int i = 0; i < listClients.size(); i++) 
-                                { 
+
+                                for (int i = 0; i < listClients.size(); i++)
+                                {
                                         if (listClients[i]->getAddress() == sender && listClients[i]->getPort() == senderPort)
                                                 flag = true;
                                 }
-                        
+
                                 if (flag == false)
                                         listClients << new Client(sender, senderPort);
                         }
-                        
-                        if (updSocketOutput_ && updSocketOutput_->hasConnection())
-                                updSocketOutput_->send(QString(datagram.data()));
+
+                        if (udpSocketOutput_ && udpSocketOutput_->hasConnection())
+                                udpSocketOutput_->send(QString(datagram.data()));
                 }
                 else

trunk/PacpusSocket/PacpusUDPSocket.h

@@ -5 +5 @@
 //  author:     Pierre Hudelaine
 //              Copyright Heudiasyc UMR UTC/CNRS 7253
-// 
+//
 //  version:    $Id: $
 //
@@ -15 +15 @@
 
 #include "Pacpus/kernel/Log.h"
-#include "Pacpus/kernel/ComponentBase.h" 
-#include "Pacpus/kernel/ComponentFactory.h" 
+#include "Pacpus/kernel/ComponentBase.h"
+#include "Pacpus/kernel/ComponentFactory.h"
 
 // Export macro for PacpusSocket DLL for Windows only
@@ -28 +28 @@
 #   endif
 #else
-    // On other platforms, simply ignore this 
-#   define PACPUSSOCKET_API 
+    // On other platforms, simply ignore this
+#   define PACPUSSOCKET_API
 #endif
 
@@ -38 +38 @@
 class PACPUSSOCKET_API Client
 {
-public: 
+public:
     /// Constructor
     Client();
@@ -44 +44 @@
     /// Destructor
     ~Client();
-    
+
     QHostAddress address_;
     quint16 port_;
-    
-    QHostAddress getAddress() {return address_;};    
+
+    QHostAddress getAddress() {return address_;};
     quint16 getPort() {return port_;};
 };
@@ -54 +54 @@
 class PACPUSSOCKET_API PacpusUDPSocket
         : public QObject
-        , public ComponentBase 
-{ 
+        , public ComponentBase
+{
   Q_OBJECT
 
-public: 
+public:
     /// Constructor
     PacpusUDPSocket(QString name);
@@ -71 +71 @@
 
     /// Slot d'envoie des paquets
-    void sendDatagrams(QString frame);
+    void sendQString(const QString& frame);
     void sendDatagrams(QByteArray frame);
-    
+
 Q_SIGNALS:
     void newDatagram(QByteArray datagram);
@@ -83 +83 @@
     virtual void stopActivity();
     virtual COMPONENT_CONFIGURATION configureComponent(XmlComponentConfig config);
-        
-        virtual void addInputs();
+
+    virtual void addInputs();
     virtual void addOutputs();
-        
-        OutputInterface<QString, PacpusUDPSocket>* udpSocketOutput_;
+
+    OutputInterface<QString, PacpusUDPSocket>* udpSocketOutput_;
 
     QUdpSocket * udpSocket_;
@@ -94 +94 @@
     quint16 port2send_;
     QHostAddress address2send_;
-    QString socketType_;         
-      
+    QString socketType_;
+
     QList <Client *> listClients;
 };

trunk/PtGreyCameras/CMakeLists.txt

@@ +1 @@
+#########################quick start############################################
+# cmake ../ -G "CodeBlocks - Unix Makefiles"
+# make
+# make install
+# make clean
+# sudo apt-get install libopencv-dev
+################################################################################
 project(PtGreyCameras)
+set(${PROJECT_NAME}_VERSION_MAJOR 0)
+set(${PROJECT_NAME}_VERSION_MINOR 1)
+# Create a DLL
+add_definitions(-DCVWEBCAM_COMPONENT_EXPORTS)
+add_definitions( -DVIDEO_EXPORTS )
+
+#include(FindOpenCV.cmake)
+find_package(OpenCV REQUIRED)
+
+# Check for OpenCV
+if(NOT OpenCV_FOUND)
+    message(FATAL_ERROR "Project ${PROJECT_NAME} requires OpenCV library")
+endif()
 ################################################################################
-add_definitions(-DPTGREYCAMERAS_EXPORTS)
-
-# ========================================
-# Configure qt4
-# ========================================
-if(QT4_FOUND)
-  set(QT_USE_QTXML true)
-  set(QT_USE_QTNETWORK true)
-  include(${QT_USE_FILE})
-else()
-  message(ERROR "Qt4 needed")
-endif()
-
-# ========================================
-# Find dependencies
-# ========================================
-find_package(OpenCV REQUIRED)
-if(OpenCV_FOUND)
-    list(APPEND OpenCV_LIBS ${OpenCV_LIBRARIES})
-    list(APPEND OpenCV_INCLUDE_DIR ${OpenCV_INCLUDE_DIRS})
-    include_directories(${OpenCV_INCLUDE_DIR})
-endif(OpenCV_FOUND)
-
-
-# ========================================
-# Compiler definitions
-# ========================================
-add_definitions(
-  ${QT_DEFINITIONS}
-)
+create_export(EXPORT_HDR ${PROJECT_NAME})
+pacpus_plugin(PLUGIN_CPP PLUGIN_HDR ${PROJECT_NAME})
+add_definitions (${QT_DEFINITIONS})
 # ========================================
 # Options
@@ -63 +56 @@
         endif()
 endif()
-
-# ========================================
-# Include directories
-# ========================================
-include_directories(
-  ${PACPUS_INCLUDE_HINT}
-  ${QT_INCLUDE_DIR}
-  ${OPT_INCLUDE_DIRS}
-  ${OpenCV_INCLUDE_DIR}  
+find_package(Qt5Network REQUIRED)
+################################################################################
+# DIRECTORIES
+include_directories( 
+    ${PROJECT_BINARY_DIR}
+    ${QT_INCLUDE_DIR}
+    ${PACPUS_INCLUDE_DIR}
+    ${PACPUS_INCLUDE_DIR}/Pacpus/
 )
 
@@ -77 +69 @@
 # Link directories
 # ========================================
-link_directories(
-  ${PACPUS_LIBRARY_HINT}
+link_directories( 
+        ${PACPUS_LIB_DIR}
 )
 
-message("Creating source files for the plugin(s)")
-message(STATUS PLUGIN_H=${PLUGIN_H})
-message(STATUS PLUGIN_CPP=${PLUGIN_CPP})
+################################################################################
+# FILES
+set(PROJECT_HDRS
+    ${EXPORT_HDR}
+    PtGreyCamerasExp.h
+    #../../StdDbtPlayerComponents/ImageBaseStructure.h
+)
+set(PROJECT_SRCS
+    ${PLUGIN_CPP} 
+)
 
-pacpus_plugin(PLUGIN_CPP PLUGIN_H ${PROJECT_NAME} )
+if(OpenCV_FOUND)
+    list(APPEND OpenCV_LIBS ${OpenCV_LIBRARIES})
+    list(APPEND OpenCV_INCLUDE_DIR ${OpenCV_INCLUDE_DIRS})
+    include_directories(${OpenCV_INCLUDE_DIR})
+endif(OpenCV_FOUND)
 
-# ========================================
-# List of sources
-# ========================================
-set(
-        PROJECT_SRCS
-        PtGreyCamerasExp.h
-        #../../StdDbtPlayerComponents/ImageBaseStructure.h
-        ${PLUGIN_CPP}
-)
 if(BUILD_PtGreyCameras AND BumbleBeeXB3_FOUND )
         list(APPEND PROJECT_SRCS
@@ -112 +106 @@
 endif()
 
-# ========================================
-# Files to MOC
-# ========================================
-set(
-        FILES_TO_MOC
-        ${PLUGIN_H}
+set(FILES_TO_MOC
+    ${PLUGIN_HDR}
 )
 if(BUILD_PtGreyCameras AND BumbleBeeXB3_FOUND)
@@ -134 +124 @@
 endif() 
 
-set(
-    UI_FILES
-#    WidgetIMU.ui
-
+set(UI_FILES
 )
 
-# ========================================
-# Directories architecture
-# ========================================
-#SOURCE_GROUP(PtGreyCameras FILES ${PROJECT_SRCS} )
-SOURCE_GROUP(moc FILES ${PROJECT_MOC_SRCS})
-
-# ========================================
-# Call MOC
-# ========================================
-qt4_wrap_cpp(
-    PROJECT_MOC_SRCS
+################################################################################
+# Qt: call moc, uic
+qt_wrap_cpp(PROJECT_MOC_SRCS
     ${FILES_TO_MOC}
 )
 
-qt4_wrap_ui(
-    PROJECT_UI_SRCS
+qt_wrap_ui(PROJECT_UI_SRCS
     ${UI_FILES}
 )
 
-# ========================================
-# Build a library
-# ========================================
-pacpus_add_library(
-    ${PROJECT_NAME} SHARED
+################################################################################
+# BUILD and LINK
+pacpus_add_library(${PROJECT_NAME} SHARED
+    ${PROJECT_HDRS}
     ${PROJECT_SRCS}
     ${PROJECT_MOC_SRCS}
     ${PROJECT_UI_SRCS}
 )
+
+
 # ========================================
 # Libraries
 # ========================================
-# All the platform
-message ( "\${VAR} = ${OPT_LIBRARIES}")
-target_link_libraries(
-    ${PROJECT_NAME}
-    ${PACPUS_LIBRARIES}
-    ${QT_LIBRARIES}
-        optimized ${OPT_LIBRARIES} debug ${DBG_LIBRARIES}
-        ${PACPUS_DEPENDENCIES_LIB}
-        ${OpenCV_LIBS}
-        ${BumbleBeeXB3_PGR_LIBRARIES}
-        ${BumbleBeeXB3_TRICLOPS_LIBRARIES}      
+set(LIBS
+    optimized FileLib debug FileLib_d
+    optimized PacpusLib debug PacpusLib_d
+    optimized PacpusTools debug PacpusTools_d
 )
-
-# ========================================
-# Install
-# ========================================
-pacpus_install(${PROJECT_NAME})
+if (WIN32)
+    list(APPEND LIBS
+        optimized ROAD_TIME debug ROAD_TIME_d
+    )
+endif()
+# LINK 
+target_link_libraries(${PROJECT_NAME} 
+                      ${PACPUS_LIBRARIES} 
+                      ${PACPUS_DEPENDENCIES_LIB} 
+                      ${LIBS}
+                      ${QT_LIBRARIES} 
+                      ${OpenCV_LIBS}
+                     )
+qt5_use_modules(${PROJECT_NAME} Network)
+################################################################################
+# FOLDERS
+pacpus_folder(${PROJECT_NAME} "components")
+################################################################################
+# INSTALL
+pacpus_install(${PROJECT_NAME}) 

trunk/PtGreyCameras/Flea3Grabber.h

@@ -5 +5 @@
 //  author:     Danilo Alves de Lima
 //              Copyright Heudiasyc UMR UTC/CNRS 6599
-// 
+//
 //  version:    $Id: $
 //
-//  purpose:    
+//  purpose:
 *********************************************************************/
 
@@ -31 +31 @@
 #include <string>
 #include <vector>
-#include "../../../Pacpussensors/trunk/StdDbtPlayerComponents/ImageBaseStructure.h"
+#include "../StdDbtPlayerComponents/ImageBaseStructure.h"
 
 namespace pacpus {
@@ -58 +58 @@
         unsigned int cam_trigger_mode;          // Trigger mode
         unsigned int cam_trigger_enable;        // Trigger enable (1 on // 0 off)
-        unsigned int cam_trigger_parameter;     
+        unsigned int cam_trigger_parameter;
         unsigned int cam_trigger_polarity;      // Trigger polarity (0 low // 1 high)
         unsigned int cam_trigger_source;        // Source (GPIO)
@@ -85 +85 @@
         //----------------------------------------------------------------------------------------------------------------
         bool showdebug;                                         // Show frame acquired
-                
-        int mMaxImageOutputSize;                        // Size of the input image data in the memory   
-        
+
+        int mMaxImageOutputSize;                        // Size of the input image data in the memory
+
         // Output directory
         QDir mOutputDirectory;
@@ -98 +98 @@
 
 /** Class to provide the obstacle detection from a disparity map data */
-class PTGREYCAMERAS_API Flea3Grabber:   public QThread, 
+class PTGREYCAMERAS_API Flea3Grabber:   public QThread,
                                                                                 public ComponentBase
 {
@@ -114 +114 @@
         //==============================================================================================
 
-        /** 
+        /**
         * Initialize default values
         */
         void InitDefault(int indice);
 
-        int img2send_;  
+        int img2send_;
 
 protected:

trunk/PtGreyCameras/PtGreyCamerasPlugin.cpp

@@ -1 @@
-// Autogenerated file by PacpusPlugin.cmake
+// Autogenerated file by PacpusUtilities.cmake
 // DO NOT EDIT!!! ALL CHANGES WOULD BE REMOVED BY THE NEXT CALL OF CMAKE
 
@@ -17 +17 @@
 }
 
-Q_EXPORT_PLUGIN2(PtGreyCamerasPlugin, PtGreyCamerasPlugin)
+//Qt4 Plugin Macro desactivated
+//Q_EXPORT_PLUGIN2(PtGreyCamerasPlugin, PtGreyCamerasPlugin)

trunk/PtGreyCameras/PtGreyCamerasPlugin.h

@@ -1 @@
-// Autogenerated file by PacpusPlugin.cmake
+// Autogenerated file by PacpusUtilities.cmake
 // DO NOT EDIT!!! ALL CHANGES WOULD BE REMOVED BY THE NEXT CALL OF CMAKE
 
@@ -16 +16 @@
 {
     Q_OBJECT
+    //Qt5 Plugins Macro
+    Q_PLUGIN_METADATA(IID "pacpus.PtGreyCamerasPlugin" FILE "PtGreyCamerasPlugin.json")
     Q_INTERFACES(PacpusPluginInterface)
 

trunk/Sick/CMakeLists.txt

@@ +1 @@
+#########################quick start############################################
+#cmake ../ -G "CodeBlocks - Unix Makefiles"
+#make
+#make install
+#make clean
+################################################################################
 project(Sick)
-
-################################################################################
+set(${PROJECT_NAME}_VERSION_MAJOR 0)
+set(${PROJECT_NAME}_VERSION_MINOR 1)
 add_definitions( -DSICK_EXPORTS )
 add_definitions( -DSICKLDMRS_EXPORTS )
 add_definitions( -DSICKLMS_EXPORTS )
+################################################################################
+create_export(EXPORT_HDR ${PROJECT_NAME})
+pacpus_plugin(PLUGIN_CPP PLUGIN_HDR ${PROJECT_NAME})
+add_definitions (${QT_DEFINITIONS})
 
-# ========================================
-# Configure qt4
-# ========================================
-if(QT4_FOUND)
-  set(QT_USE_QTXML true)
-  set(QT_USE_QTNETWORK true)
-  include(${QT_USE_FILE})
-else()
-  message(ERROR "Qt4 needed")
-endif()
-find_package(OpenGL REQUIRED)
-# ========================================
-# Compiler definitions
-# ========================================
-add_definitions(
-  ${QT_DEFINITIONS}
-)
-
-# ========================================
-# Include directories
-# ========================================
-include_directories(
-  ${PROJECT_BINARY_DIR}
-  ${QT_INCLUDE_DIR}
+find_package(Qt5Network REQUIRED)
+################################################################################
+# DIRECTORIES
+include_directories( 
+    ${PROJECT_BINARY_DIR}
+    ${QT_INCLUDE_DIR}
+    ${PACPUS_INCLUDE_DIR} 
+    ${PACPUS_INCLUDE_DIR}/Pacpus/
 )
 
@@ -35 +29 @@
 # Link directories
 # ========================================
-link_directories( ${PACPUS_LIB_DIR}
+link_directories( 
+        ${PACPUS_LIB_DIR}
 )
 
 
-pacpus_plugin(PLUGIN_CPP PLUGIN_H ${PROJECT_NAME} )
-
-# ========================================
-# List of sources
-# ========================================
-set(
-    PROJECT_SRCS
-  SickComponent.h
-  SickComponent.cpp
-  AbstractSickSensor.h
-  AbstractSickSensor.cpp
-  SickLDMRSSensor.h
-  SickLDMRSSensor.cpp
-  SickLMSSensor.h
-  SickLMSSensor.cpp
-  SickSocket.h
-  SickSocket.cpp
+################################################################################
+# FILES
+set(PROJECT_HDRS
+    ${EXPORT_HDR}
+    SickComponent.h
+    AbstractSickSensor.h
+    SickLDMRSSensor.h
+    SickLMSSensor.h
+    SickSocket.h
+    xml/${PROJECT_NAME}.xml
+    xml/${PROJECT_NAME}_d.xml
+)
+set(PROJECT_SRCS
     ${PLUGIN_CPP}
+    SickComponent.cpp
+    AbstractSickSensor.cpp
+    SickLDMRSSensor.cpp
+    SickLMSSensor.cpp
+    SickSocket.cpp 
 )
 
-# ========================================
-# Files to MOC
-# ========================================
-set(
-    FILES_TO_MOC
-     SickComponent.h
-     SickLDMRSSensor.h
-     SickLMSSensor.h
-     AbstractSickSensor.h
-     SickSocket.h
-    ${PLUGIN_H}
+set(FILES_TO_MOC
+    ${PLUGIN_HDR}
+    SickComponent.h
+    AbstractSickSensor.h
+    SickLDMRSSensor.h
+    SickLMSSensor.h
+    SickSocket.h
 )
 
-set(
-    UI_FILES
-
+set(UI_FILES
 )
 
-# ========================================
-# Call MOC
-# ========================================
-qt4_wrap_cpp(
-    PROJECT_MOC_SRCS
+################################################################################
+# Qt: call moc, uic
+qt_wrap_cpp(PROJECT_MOC_SRCS
     ${FILES_TO_MOC}
 )
 
-qt4_wrap_ui(
-    PROJECT_UI_SRCS
+qt_wrap_ui(PROJECT_UI_SRCS
     ${UI_FILES}
 )
 
-# ========================================
-# Build a library
-# ========================================
-pacpus_add_library(
-    ${PROJECT_NAME} SHARED
+################################################################################
+# BUILD and LINK
+pacpus_add_library(${PROJECT_NAME} SHARED
+    ${PROJECT_HDRS}
     ${PROJECT_SRCS}
     ${PROJECT_MOC_SRCS}
@@ -100 +86 @@
 )
 
-message(STATUS  ${PACPUS_DEPENDENCIES_LIB} ) 
 
+# ========================================
+# Libraries
+# ========================================
 set(LIBS
     optimized FileLib debug FileLib_d
@@ -112 +100 @@
     )
 endif()
-
-# ========================================
-# Libraries
-# ========================================
-# All the platform
-target_link_libraries(
-    ${PROJECT_NAME}
-    ${PACPUS_LIBRARIES}
-    ${QT_LIBRARIES}
-        ${PACPUS_DEPENDENCIES_LIB}
-        ${OPENGL_LIBRARIES}
-        ${LIBS}
-)
-
+# LINK 
+target_link_libraries(${PROJECT_NAME} 
+                      ${PACPUS_LIBRARIES} 
+                      ${PACPUS_DEPENDENCIES_LIB} 
+                      ${LIBS}
+                      ${QT_LIBRARIES} 
+                     )
+qt5_use_modules(${PROJECT_NAME} Network)
+################################################################################
+# FOLDERS
 pacpus_folder(${PROJECT_NAME} "components")
-
-# ========================================
-# Install
-# ========================================
-pacpus_install(${PROJECT_NAME})
+################################################################################
+# INSTALL
+pacpus_install(${PROJECT_NAME}) 

trunk/Sick/SickSocket.cpp

@@ -97 +97 @@
   mutex.lock();
   QTextStream os(socket);
-  os << data.toAscii() << endl;
+  os << data.toLatin1() << endl;//change in qt5
   mutex.unlock();
-  qDebug() << "data sent to server: " << data.toAscii() ; //a adapter aussi
+  qDebug() << "data sent to server: " << data.toLatin1() ; //a adapter aussi
 }
 

trunk/SpanCPTComponent/CMakeLists.txt

@@ +1 @@
+#########################quick start############################################
+#cmake ../ -G "CodeBlocks - Unix Makefiles"
+#make
+#make install
+#make clean
+################################################################################
 project(SpanCPTComponent)
 
@@ -4 +10 @@
 add_definitions( -DCPTCOMPONENT_EXPORTS )
 add_definitions( -DPLUGINLIB_EXPORTS ) 
+################################################################################
+create_export(EXPORT_HDR ${PROJECT_NAME})
+pacpus_plugin(PLUGIN_CPP PLUGIN_HDR ${PROJECT_NAME})
+add_definitions (${QT_DEFINITIONS})
 
-
-# ========================================
-# Configure qt4
-# ========================================
-if(QT4_FOUND)
-  set(QT_USE_QTXML true)
-  set(QT_USE_QTNETWORK true)
-  include(${QT_USE_FILE})
-else()
-  message(ERROR "Qt4 needed")
-endif()
-
-# ========================================
-# Compiler definitions
-# ========================================
-add_definitions(
-  ${QT_DEFINITIONS}
-)
-
-# ========================================
-# Include directories
-# ========================================
-include_directories(
-  ${PROJECT_BINARY_DIR}
-  ${QT_INCLUDE_DIR}
+find_package(Qt5Network REQUIRED)
+################################################################################
+# DIRECTORIES
+include_directories( 
+    ${PROJECT_BINARY_DIR}
+    ${QT_INCLUDE_DIR}
+    ${PACPUS_INCLUDE_DIR}
+    ${PACPUS_INCLUDE_DIR}/Pacpus/
 )
 
@@ -40 +33 @@
 
 
-pacpus_plugin(PLUGIN_CPP PLUGIN_H ${PROJECT_NAME} )
-
-# ========================================
-# List of sources
-# ========================================
-set(
-    PROJECT_SRCS
-        CPTComponent.h
-        CPTComponent.cpp
+################################################################################
+# FILES
+set(PROJECT_HDRS
+    ${EXPORT_HDR}
+    CPTComponent.h  
     ../driver/AbstractSerialPort.h
-    ../driver/AbstractSerialPort.cpp
+    xml/spancpt.xml 
+)
+set(PROJECT_SRCS
     ${PLUGIN_CPP}
+    CPTComponent.cpp 
+    ../driver/AbstractSerialPort.cpp 
 )
 
@@ -70 +63 @@
 endif(UNIX)
 
-
-# ========================================
-# Files to MOC
-# ========================================
-
 if(UNIX)
 set(FILES_TO_MOC 
@@ -80 +68 @@
   CPTComponent.h
   ../driver/PosixSerialPort.h
-    ${PLUGIN_H}
+    ${PLUGIN_HDR}
   )
 endif(UNIX)
@@ -89 +77 @@
   CPTComponent.h
   ../driver/Win32SerialPort.h
-    ${PLUGIN_H}
+    ${PLUGIN_HDR}
   )
 endif(WIN32)
 
-set(
-    UI_FILES
+set(UI_FILES
 )
 
-# ========================================
-# Call MOC
-# ========================================
-qt4_wrap_cpp(
-    PROJECT_MOC_SRCS
+################################################################################
+# Qt: call moc, uic
+qt_wrap_cpp(PROJECT_MOC_SRCS
     ${FILES_TO_MOC}
 )
 
-qt4_wrap_ui(
-    PROJECT_UI_SRCS
+qt_wrap_ui(PROJECT_UI_SRCS
     ${UI_FILES}
 )
 
-# ========================================
-# Build a library
-# ========================================
-pacpus_add_library(
-    ${PROJECT_NAME} SHARED
+################################################################################
+# BUILD and LINK
+pacpus_add_library(${PROJECT_NAME} SHARED
+    ${PROJECT_HDRS}
     ${PROJECT_SRCS}
     ${PROJECT_MOC_SRCS}
@@ -120 +103 @@
 )
 
+
 # ========================================
 # Libraries
 # ========================================
-if(WIN32)
-    set(LIBS
-        # add your specific libraries to link here
-        optimized NMEA0183LIB debug NMEA0183LIB_d
-                optimized PacpusTools debug PacpusTools_d
+set(LIBS
+    optimized FileLib debug FileLib_d
+    optimized PacpusLib debug PacpusLib_d
+    optimized PacpusTools debug PacpusTools_d
+    optimized NMEA0183LIB debug NMEA0183LIB_d
+)
+if (WIN32)
+    list(APPEND LIBS
+        optimized ROAD_TIME debug ROAD_TIME_d
     )
-endif(WIN32)
-
-if(UNIX)
-    set(LIBS
-        # add your specific libraries to link here
-
-    )
-endif(UNIX)
-
-# All the platform
-target_link_libraries(
-    ${PROJECT_NAME}
-    ${PACPUS_LIBRARIES}
-    ${QT_LIBRARIES}
-        ${PACPUS_DEPENDENCIES_LIB}
-        ${LIBS}
-#       optimized PacpusTools debug PacpusTools_d
-)
+endif()
+# LINK 
+target_link_libraries(${PROJECT_NAME} 
+                      ${PACPUS_LIBRARIES} 
+                      ${PACPUS_DEPENDENCIES_LIB} 
+                      ${LIBS}
+                      ${QT_LIBRARIES} 
+                     )
+qt5_use_modules(${PROJECT_NAME} Network)
+################################################################################
+# FOLDERS
 pacpus_folder(${PROJECT_NAME} "components")
-
-# ========================================
-# Install
-# ========================================
-pacpus_install(${PROJECT_NAME})
-
+################################################################################
+# INSTALL
+pacpus_install(${PROJECT_NAME}) 

trunk/SpanCPTComponent/CPTComponent.cpp

@@ -183 +183 @@
     memcpy(buffer, currentDataFrame, currentDataFrameLength_);
     buffer[currentDataFrameLength_] = '\0'; // add a \0 to convert for the conversion in QString
-    currentDataFrame_ = QString::fromAscii(buffer);
+    currentDataFrame_ = "";
+    currentDataFrame_.append(buffer);
 
         delete[] buffer;

trunk/SpanCPTComponent/CPTComponent.h

@@ -17 +17 @@
 #include <fstream>
 #include <qobject.h>
+#include <QPointF>
 #include <string>
 
@@ -162 +163 @@
                      TimestampedInscovFrame*);
 
-        // component ouputs
-        void addOutputs();
-        OutputInterface<QPointF, CPTComponent>* position2DENUOutput_;
+    // component ouputs
+    void addOutputs();
+    OutputInterface<QPointF, CPTComponent>* position2DENUOutput_;
 };
 

trunk/StdDbtPlayerComponents/CMakeLists.txt

@@ +1 @@
+#########################quick start############################################
+#cmake ../ -G "CodeBlocks - Unix Makefiles"
+#make
+#make install
+#make clean
+################################################################################
 project(StdDbtPlayerComponents)
-
-################################################################################
+set(${PROJECT_NAME}_VERSION_MAJOR 0)
+set(${PROJECT_NAME}_VERSION_MINOR 1)
 add_definitions( -DSTDDBTPLAYERCOMPONENTS_EXPORTS )
 add_definitions( -DDBTPLYSICK_EXPORTS)
 add_definitions( -DDBTPLYSICK_EXPORTS)
-# ========================================
-# Include directories
-# ========================================
-include_directories(
-  ${PROJECT_BINARY_DIR}
-  ${QT_INCLUDE_DIR}
+################################################################################
+create_export(EXPORT_HDR ${PROJECT_NAME})
+pacpus_plugin(PLUGIN_CPP PLUGIN_HDR ${PROJECT_NAME})
+add_definitions (${QT_DEFINITIONS})
+
+find_package(Qt5Network REQUIRED)
+################################################################################
+# DIRECTORIES
+include_directories( 
+    ${PROJECT_BINARY_DIR}
+    ${QT_INCLUDE_DIR}
+    ${PACPUS_INCLUDE_DIR}
+    ${PACPUS_INCLUDE_DIR}/Pacpus/
 )
 
@@ -16 +29 @@
 # Link directories
 # ========================================
-link_directories( ${PACPUS_LIB_DIR}
-)
-
-pacpus_plugin(PLUGIN_CPP PLUGIN_H ${PROJECT_NAME} )
-
-set(HDRS
-        StdDbtPlayerComponentsConfig.h
-    DbtPlySickLMSManager.h
-    DbtPlySickLDMRSManager.h
+link_directories( 
+        ${PACPUS_LIB_DIR}
 )
 
 
-# ========================================
-# List of sources
-# ========================================
-set(
-    PROJECT_SRCS
+################################################################################
+# FILES
+set(PROJECT_HDRS
+    ${EXPORT_HDR}
+    StdDbtPlayerComponentsConfig.h
+    DbtPlySickLMSManager.h
+    DbtPlySickLDMRSManager.h 
+    ${PROJECT_NAME}.xml
+    ${PROJECT_NAME}_d.xml
+)
+set(PROJECT_SRCS
+    ${PLUGIN_CPP}
     DbtPlySickLMSManager.cpp
-    DbtPlySickLDMRSManager.cpp
-        ${HDRS}
-    ${PLUGIN_CPP}
+    DbtPlySickLDMRSManager.cpp  
 )
 
-# ========================================
-# Files to MOC
-# ========================================
-set(
-    FILES_TO_MOC
+set(FILES_TO_MOC
+    ${PLUGIN_HDR}
     DbtPlySickLMSManager.h
-    DbtPlySickLDMRSManager.h
-        ${PLUGIN_H}
-        )   
-
-
-set(
-    UI_FILES
-
+    DbtPlySickLDMRSManager.h 
 )
 
-# ========================================
-# Call MOC
-# ========================================
-qt_wrap_cpp(
-    PROJECT_MOC_SRCS
+set(UI_FILES
+)
+
+################################################################################
+# Qt: call moc, uic
+qt_wrap_cpp(PROJECT_MOC_SRCS
     ${FILES_TO_MOC}
 )
 
-qt_wrap_ui(
-    PROJECT_UI_SRCS
+qt_wrap_ui(PROJECT_UI_SRCS
     ${UI_FILES}
 )
 
-# ========================================
-# Build a library
-# ========================================
-pacpus_add_library(
-    ${PROJECT_NAME} SHARED
+################################################################################
+# BUILD and LINK
+pacpus_add_library(${PROJECT_NAME} SHARED
+    ${PROJECT_HDRS}
     ${PROJECT_SRCS}
     ${PROJECT_MOC_SRCS}
@@ -78 +78 @@
 )
 
+
+# ========================================
+# Libraries
+# ========================================
 set(LIBS
     optimized FileLib debug FileLib_d
@@ -88 +92 @@
     )
 endif()
+# LINK 
+target_link_libraries(${PROJECT_NAME} 
+                      ${PACPUS_LIBRARIES} 
+                      ${PACPUS_DEPENDENCIES_LIB} 
+                      ${LIBS}
+                      ${QT_LIBRARIES} 
+                     )
+qt5_use_modules(${PROJECT_NAME} Network)
+################################################################################
+# FOLDERS
+pacpus_folder(${PROJECT_NAME} "components")
+################################################################################
+# INSTALL
+pacpus_install(${PROJECT_NAME}) 
 
-# ========================================
-# Libraries
-# ========================================
-# All the platform
-target_link_libraries(
-    ${PROJECT_NAME}
-    ${PACPUS_LIBRARIES}
-    ${QT_LIBRARIES}
-        ${PACPUS_DEPENDENCIES_LIB}
-        ${LIBS}
+# install headers
+install(
+    DIRECTORY
+        ${StdDbtPlayerComponents_SOURCE_DIR}
+    DESTINATION
+        ${PACPUS_INSTALL_DIR}/include
+    FILES_MATCHING PATTERN "*.h"
 )
-
-pacpus_folder(${PROJECT_NAME} "components")
-
-# ========================================
-# Install
-# ========================================
-pacpus_install(${PROJECT_NAME})

trunk/StdDbtPlayerComponents/DbtPlySickLDMRSManager.h

@@ -5 +5 @@
 //  author:     Cyril Fougeray
 //              Copyright Heudiasyc UMR UTC/CNRS 6599
-// 
+//
 //  version:    $Id: $
 //
-//  purpose:    
+//  purpose:
 // *********************************************************************
 
@@ -29 +29 @@
 #   endif
 #else
-    // On other platforms, simply ignore this 
-#   define DBTPLYSICK_API 
+    // On other platforms, simply ignore this
+#   define DBTPLYSICK_API
 #endif
 
 namespace pacpus {
-    
+
 class ShMem;
 
@@ -64 +64 @@
 } // namespace pacpus
 
-#endif 
+#endif

trunk/StdDbtPlayerComponents/StdDbtPlayerComponentsConfig.h

@@ -1 @@
-#ifndef __STDDBTPLAYERCOMPONENTS_H__
-#define __STDDBTPLAYERCOMPONENTS_H__
+// Autogenerated file by PacpusUtilities.cmake
+// DO NOT EDIT!!! ALL CHANGES WOULD BE REMOVED BY THE NEXT CALL OF CMAKE
 
-// Export macro for CanGateway DLL for Windows only
+#ifndef __STDDBTPLAYERCOMPONENTS_CONFIG_H__
+#define __STDDBTPLAYERCOMPONENTS_CONFIG_H__
+
+// Export macro for use DLL for Windows only
 #ifdef WIN32
-#   ifdef STDDBTPLAYERCOMPONENTS_EXPORTS
-        // make DLL
-#       define STDDBTPLAYERCOMPONENTS_API __declspec(dllexport)
-#   else
-        // use DLL
-#       define STDDBTPLAYERCOMPONENTS_API __declspec(dllimport)
-#   endif
+   #ifdef STDDBTPLAYERCOMPONENTS_EXPORTS
+//      make DLL
+       #define STDDBTPLAYERCOMPONENTS_API __declspec(dllexport)
+   #else
+//      use DLL
+       #define STDDBTPLAYERCOMPONENTS_API __declspec(dllimport)
+   #endif
 #else
-    // On other platforms, simply ignore this 
-#   define STDDBTPLAYERCOMPONENTS_API 
+//      On other platforms, simply ignore this
+   #define STDDBTPLAYERCOMPONENTS_API
 #endif
 
-#endif 
+#endif // __STDDBTPLAYERCOMPONENTS_CONFIG_H__

trunk/TelnetClient/CMakeLists.txt

@@ +1 @@
+#########################quick start############################################
+#cmake ../ -G "CodeBlocks - Unix Makefiles"
+#make
+#make install
+#make clean
+################################################################################
 project(TelnetClient)
+set(${PROJECT_NAME}_VERSION_MAJOR 0)
+set(${PROJECT_NAME}_VERSION_MINOR 1)
+add_definitions( -DTelnetClient_EXPORTS )
 ################################################################################
-add_definitions(-DTelnetClient_EXPORTS)
+create_export(EXPORT_HDR ${PROJECT_NAME})
+pacpus_plugin(PLUGIN_CPP PLUGIN_HDR ${PROJECT_NAME})
+add_definitions (${QT_DEFINITIONS})
 
-# ========================================
-# Configure qt4
-# ========================================
-if(QT4_FOUND)
-  set(QT_USE_QTXML true)
-  set(QT_USE_QTNETWORK true)
-  include(${QT_USE_FILE})
-else()
-  message(ERROR "Qt4 needed")
-endif()
-
-# ========================================
-# Compiler definitions
-# ========================================
-add_definitions(
-  ${QT_DEFINITIONS}
-)
-
-# ========================================
-# Include directories
-# ========================================
+find_package(Qt5Network REQUIRED)
+################################################################################
+# DIRECTORIES
 include_directories(
-  ${PROJECT_BINARY_DIR}
-  ${QT_INCLUDE_DIR}
+    ${PROJECT_BINARY_DIR}
+    ${QT_INCLUDE_DIR}
+    ${PACPUS_INCLUDE_DIR} 
+    ${PACPUS_INCLUDE_DIR}/Pacpus/
 )
 
@@ -32 +27 @@
 # Link directories
 # ========================================
-link_directories(
+link_directories( 
+        ${PACPUS_LIB_DIR}
 )
 
-pacpus_plugin(PLUGIN_CPP PLUGIN_H ${PROJECT_NAME} )
 
-# ========================================
-# List of sources
-# ========================================
-set(
-    PROJECT_SRCS
-    TelnetClient.cpp    
+################################################################################
+# FILES
+set(PROJECT_HDRS
+    ${EXPORT_HDR}
+    TelnetClient.h  
+    xml/${PROJECT_NAME}.xml
+    xml/${PROJECT_NAME}_d.xml
+)
+set(PROJECT_SRCS
     ${PLUGIN_CPP}
+    TelnetClient.cpp  
 )
 
-# ========================================
-# Files to MOC
-# ========================================
-set(
-    FILES_TO_MOC
-    TelnetClient.h
-    ${PLUGIN_H}
+set(FILES_TO_MOC
+    ${PLUGIN_HDR}
+    TelnetClient.h 
 )
 
-set(
-    UI_FILES
-
+set(UI_FILES
 )
 
-# ========================================
-# Call MOC
-# ========================================
-qt4_wrap_cpp(
-    PROJECT_MOC_SRCS
+################################################################################
+# Qt: call moc, uic
+qt_wrap_cpp(PROJECT_MOC_SRCS
     ${FILES_TO_MOC}
 )
 
-qt4_wrap_ui(
-    PROJECT_UI_SRCS
+qt_wrap_ui(PROJECT_UI_SRCS
     ${UI_FILES}
 )
 
-# ========================================
-# Build a library
-# ========================================
-pacpus_add_library(
-    ${PROJECT_NAME} SHARED
+################################################################################
+# BUILD and LINK
+pacpus_add_library(${PROJECT_NAME} SHARED
+    ${PROJECT_HDRS}
     ${PROJECT_SRCS}
     ${PROJECT_MOC_SRCS}
@@ -83 +72 @@
 )
 
+
 # ========================================
 # Libraries
 # ========================================
-# All the platform
-target_link_libraries(
-    ${PROJECT_NAME}
-    ${PACPUS_LIBRARIES}
-    ${QT_LIBRARIES}
-        ${PACPUS_DEPENDENCIES_LIB}
+set(LIBS
+    optimized FileLib debug FileLib_d
+    optimized PacpusLib debug PacpusLib_d
+    optimized PacpusTools debug PacpusTools_d
 )
-
-# ========================================
-# Install
-# ========================================
-pacpus_install(${PROJECT_NAME})
-
+if (WIN32)
+    list(APPEND LIBS
+        optimized ROAD_TIME debug ROAD_TIME_d
+    )
+endif()
+# LINK 
+target_link_libraries(${PROJECT_NAME} 
+                      ${PACPUS_LIBRARIES} 
+                      ${PACPUS_DEPENDENCIES_LIB} 
+                      ${LIBS}
+                      ${QT_LIBRARIES} 
+                     )
+qt5_use_modules(${PROJECT_NAME} Network)
+################################################################################
+# FOLDERS
+pacpus_folder(${PROJECT_NAME} "components")
+################################################################################
+# INSTALL
+pacpus_install(${PROJECT_NAME}) 

trunk/TelnetClient/TelnetClient.cpp

@@ -13 +13 @@
 
 #include "TelnetClient.h" 
-
+#include <string>
 
 using namespace pacpus;
+using namespace std;
 
+/// Default host address = 0.0.0.0 (any address)
+static const string kDefaultHostAddress = "127.0.0.1";
+/// Default host port = 2368
+static const uint16_t kDefaultHostPort = 2368;
 
 DECLARE_STATIC_LOGGER("pacpus.base.TelnetClient");
@@ -33 +38 @@
     : ComponentBase(name) 
 {
+    address_.setAddress(kDefaultHostAddress.c_str());
+    port_ = kDefaultHostPort;
 } 
 
@@ -50 +57 @@
 ComponentBase::COMPONENT_CONFIGURATION  TelnetClient::configureComponent(XmlComponentConfig config) 
 { 
-        address_.setAddress(param.getProperty("address"));
-        port_ = param.getProperty("port").toUInt();
 
         return ComponentBase::CONFIGURED_OK; 

trunk/VelodyneComponent/CMakeLists.txt

@@ +1 @@
+#########################quick start############################################
+#cmake ../ -G "CodeBlocks - Unix Makefiles"
+#make
+#make install
+#make clean
+################################################################################
 project(Velodyne)
+set(${PROJECT_NAME}_VERSION_MAJOR 0)
+set(${PROJECT_NAME}_VERSION_MINOR 1)
+add_definitions( -DVELODYNEHDL64S2_EXPORTS )
+################################################################################
+create_export(EXPORT_HDR ${PROJECT_NAME})
+pacpus_plugin(PLUGIN_CPP PLUGIN_HDR ${PROJECT_NAME})
+add_definitions (${QT_DEFINITIONS})
 
+find_package(Qt5Network REQUIRED)
 ################################################################################
-add_definitions( -DVELODYNEHDL64S2_EXPORTS )
-
-
-
-# ========================================
-# Configure qt4
-# ========================================
-if(QT4_FOUND)
-  set(QT_USE_QTXML true)
-  set(QT_USE_QTNETWORK true)
-  include(${QT_USE_FILE})
-else()
-  message(ERROR "Qt4 needed")
-endif()
-
-# ========================================
-# Compiler definitions
-# ========================================
-add_definitions(
-  ${QT_DEFINITIONS}
-)
-
-# ========================================
-# Include directories
-# ========================================
-include_directories(
-  ${PROJECT_BINARY_DIR}
-  ${QT_INCLUDE_DIR}
+# DIRECTORIES
+include_directories( 
+    ${PROJECT_BINARY_DIR}
+    ${QT_INCLUDE_DIR}
+    ${PACPUS_INCLUDE_DIR} 
+    ${PACPUS_INCLUDE_DIR}/Pacpus/
 )
 
@@ -35 +27 @@
 # Link directories
 # ========================================
-link_directories( ${PACPUS_LIB_DIR}
+link_directories( 
+        ${PACPUS_LIB_DIR}
 )
 
 
-pacpus_plugin(PLUGIN_CPP PLUGIN_H ${PROJECT_NAME} )
-
-# ========================================
-# List of sources
-# ========================================
-set(
-    PROJECT_SRCS
-        VelodyneComponent.cpp
-        VelodyneComponent.h
+################################################################################
+# FILES
+set(PROJECT_HDRS
+    ${EXPORT_HDR}
+    VelodyneComponent.h 
+    structure_velodyne.h 
+    ${PROJECT_NAME}.xml
+    ${PROJECT_NAME}_d.xml
+)
+set(PROJECT_SRCS
     ${PLUGIN_CPP}
+    VelodyneComponent.cpp  
 )
 
-# ========================================
-# Files to MOC
-# ========================================
-set(
-    FILES_TO_MOC
-    VelodyneComponent.h
-    ${PLUGIN_H}
+set(FILES_TO_MOC
+    ${PLUGIN_HDR}
+    VelodyneComponent.h 
 )
 
-set(
-    UI_FILES
-
+set(UI_FILES
 )
 
-# ========================================
-# Call MOC
-# ========================================
-qt4_wrap_cpp(
-    PROJECT_MOC_SRCS
+################################################################################
+# Qt: call moc, uic
+qt_wrap_cpp(PROJECT_MOC_SRCS
     ${FILES_TO_MOC}
 )
 
-qt4_wrap_ui(
-    PROJECT_UI_SRCS
+qt_wrap_ui(PROJECT_UI_SRCS
     ${UI_FILES}
 )
 
-# ========================================
-# Build a library
-# ========================================
-pacpus_add_library(
-    ${PROJECT_NAME} SHARED
+################################################################################
+# BUILD and LINK
+pacpus_add_library(${PROJECT_NAME} SHARED
+    ${PROJECT_HDRS}
     ${PROJECT_SRCS}
     ${PROJECT_MOC_SRCS}
@@ -88 +73 @@
 )
 
-message(STATUS  ${PACPUS_DEPENDENCIES_LIB} ) 
 
+# ========================================
+# Libraries
+# ========================================
 set(LIBS
     optimized FileLib debug FileLib_d
@@ -100 +87 @@
     )
 endif()
-
-# ========================================
-# Libraries
-# ========================================
-# All the platform
-target_link_libraries(
-    ${PROJECT_NAME}
-    ${PACPUS_LIBRARIES}
-    ${QT_LIBRARIES}
-        ${PACPUS_DEPENDENCIES_LIB}
-        ${LIBS}
-)
-
+# LINK 
+target_link_libraries(${PROJECT_NAME} 
+                      ${PACPUS_LIBRARIES} 
+                      ${PACPUS_DEPENDENCIES_LIB} 
+                      ${LIBS}
+                      ${QT_LIBRARIES} 
+                     )
+qt5_use_modules(${PROJECT_NAME} Network)
+################################################################################
+# FOLDERS
 pacpus_folder(${PROJECT_NAME} "components")
-
-# ========================================
-# Install
-# ========================================
-pacpus_install(${PROJECT_NAME})
+################################################################################
+# INSTALL
+pacpus_install(${PROJECT_NAME}) 

trunk/VelodyneComponent/VelodyneComponent.cpp

@@ -5 +5 @@
 //  author:     Gerald Dherbomez
 //              Copyright Heudiasyc UMR UTC/CNRS 6599
-// 
+//
 //  version:    $Id: $
 //
@@ -20 +20 @@
 
 #include <QtEndian>
-#include <QUdpSocket>
+#include <QtNetwork/QUdpSocket>
 #include <string>
 
@@ -49 +49 @@
 {
     LOG_TRACE("constructor(" << name << ")");
-    
-    ComponentManager * mgr = ComponentManager::getInstance();
-    LOG_DEBUG("manager = " << mgr);
+
+    //ComponentManager * mgr = ComponentManager::getInstance();
+    //LOG_DEBUG("manager = " << mgr);
 
     setRecording (true);
@@ -86 +86 @@
 /// TODO: doc
 void VelodyneComponent::run()
-{ 
+{
     initialize();
     exec(); // launch the exec loop, blocking until receiving exit() signal ...
@@ -197 +197 @@
 //////////////////////////////////////////////////////////////////////////
 /// new data coming from Velodyne sensor
-void VelodyneComponent::readPendingDatagrams() 
+void VelodyneComponent::readPendingDatagrams()
 {
     // get a timestamp
@@ -338 +338 @@
             //*/
                         }
-                        
+
             mVelodyneData->range = mBlockIndex+(lastBlockIndex - 1);
             LOG_DEBUG("range = " << mVelodyneData->range);

trunk/VelodyneComponent/VelodyneComponent.h

@@ -7 +7 @@
 #define VELODYNECOMPONENT_H
 
-#include <qhostaddress.h>
+#include <QtNetwork/qhostaddress.h>
 #include <qthread.h>
 

trunk/Wifibot/CMakeLists.txt

@@ +1 @@
+#########################quick start############################################
+#cmake ../ -G "CodeBlocks - Unix Makefiles"
+#make
+#make install
+#make clean
+################################################################################
 project(Wifibot)
+set(${PROJECT_NAME}_VERSION_MAJOR 0)
+set(${PROJECT_NAME}_VERSION_MINOR 1)
+add_definitions( -DWIFIBOTXT_EXPORTS ) 
 ################################################################################
-add_definitions( -DWIFIBOTXT_EXPORTS )
+create_export(EXPORT_HDR ${PROJECT_NAME})
+pacpus_plugin(PLUGIN_CPP PLUGIN_HDR ${PROJECT_NAME})
+add_definitions (${QT_DEFINITIONS})
 
-# ========================================
-# Configure qt4
-# ========================================
-if(QT4_FOUND)
-  set(QT_USE_QTXML true)
-  set(QT_USE_QTNETWORK true)
-  include(${QT_USE_FILE})
-else()
-  message(ERROR "Qt4 needed")
-endif()
-
-# ========================================
-# Compiler definitions
-# ========================================
-add_definitions(
-  ${QT_DEFINITIONS}
-)
-
-# ========================================
-# Include directories
-# ========================================
-include_directories(
-  ${PROJECT_BINARY_DIR}
-  ${QT_INCLUDE_DIR}
+find_package(Qt5Network REQUIRED)
+################################################################################
+# DIRECTORIES
+include_directories( 
+    ${PROJECT_BINARY_DIR}
+    ${QT_INCLUDE_DIR}
+    ${PACPUS_INCLUDE_DIR} 
+    ${PACPUS_INCLUDE_DIR}/Pacpus/
 )
 
@@ -32 +27 @@
 # Link directories
 # ========================================
-link_directories( ${PACPUS_LIB_DIR}
+link_directories( 
+        ${PACPUS_LIB_DIR}
 )
 
-message (STATUS ${PACPUS_LIB_DIR})
 
-pacpus_plugin(PLUGIN_CPP PLUGIN_H ${PROJECT_NAME} )
-
-# ========================================
-# List of sources
-# ========================================
-set(
-    PROJECT_SRCS
+################################################################################
+# FILES
+set(PROJECT_HDRS
+    ${EXPORT_HDR}
+    wifibot.h
+    ps3remote.h
+)
+set(PROJECT_SRCS
+    ${PLUGIN_CPP}
     wifibot.cpp
     ps3remote.cpp
-    ${PLUGIN_CPP}
 )
 
-# ========================================
-# Files to MOC
-# ========================================
-set(
-    FILES_TO_MOC
+set(FILES_TO_MOC
+    ${PLUGIN_HDR}
     wifibot.h
     ps3remote.h
-    ${PLUGIN_H}
 )
 
-set(
-    UI_FILES
-
+set(UI_FILES
 )
 
-# ========================================
-# Call MOC
-# ========================================
-qt4_wrap_cpp(
-    PROJECT_MOC_SRCS
+################################################################################
+# Qt: call moc, uic
+qt_wrap_cpp(PROJECT_MOC_SRCS
     ${FILES_TO_MOC}
 )
 
-qt4_wrap_ui(
-    PROJECT_UI_SRCS
+qt_wrap_ui(PROJECT_UI_SRCS
     ${UI_FILES}
 )
 
-# ========================================
-# Build a library
-# ========================================
-pacpus_add_library(
-    ${PROJECT_NAME} SHARED
+################################################################################
+# BUILD and LINK
+pacpus_add_library(${PROJECT_NAME} SHARED
+    ${PROJECT_HDRS}
     ${PROJECT_SRCS}
     ${PROJECT_MOC_SRCS}
@@ -87 +73 @@
 )
 
-message(STATUS  ${PACPUS_DEPENDENCIES_LIB} ) 
 
 # ========================================
 # Libraries
 # ========================================
-# All the platform
-target_link_libraries(
-    ${PROJECT_NAME}
-    ${PACPUS_LIBRARIES}
-    ${QT_LIBRARIES}
-        ${PACPUS_DEPENDENCIES_LIB}
-        PacpusTools
-        PacpusSocket
+set(LIBS
+    optimized FileLib debug FileLib_d
+    optimized PacpusLib debug PacpusLib_d
+    optimized PacpusTools debug PacpusTools_d
+    optimized PacpusSocket debug PacpusSocket_d
 )
-
-# ========================================
-# Install
-# ========================================
-pacpus_install(${PROJECT_NAME})
-
+if (WIN32)
+    list(APPEND LIBS
+        optimized ROAD_TIME debug ROAD_TIME_d
+    )
+endif()
+# LINK 
+target_link_libraries(${PROJECT_NAME} 
+                      ${PACPUS_LIBRARIES} 
+                      ${PACPUS_DEPENDENCIES_LIB} 
+                      ${LIBS}
+                      ${QT_LIBRARIES}  
+                     )
+qt5_use_modules(${PROJECT_NAME} Network)
+################################################################################
+# FOLDERS
+pacpus_folder(${PROJECT_NAME} "components")
+################################################################################
+# INSTALL
+pacpus_install(${PROJECT_NAME}) 

trunk/Wifibot/ps3remote.cpp

@@ -31 +31 @@
 
 
-PS3remote::PS3remote(PacpusSocket * socket)
+PS3remote::PS3remote(PacpusUDPSocket * socket)
 {
     quit = 0;

trunk/Wifibot/ps3remote.h

@@ -5 +5 @@
 //  author:     Pierre Hudelaine
 //              Copyright Heudiasyc UMR UTC/CNRS 7253
-// 
+//
 //  version:    $Id: $
 //
@@ -18 +18 @@
 # include <QThread>
 # include <QTimer>
+# include <QMutex>
 
 # include "../Dualshock/controller.h"
-# include "../../../pacpusbase/PacpusSocket/PacpusSocket.h"
+# include "../PacpusSocket/PacpusUDPSocket.h"
 
 namespace pacpus {
@@ -29 +30 @@
         public:
             PS3remote();
-            PS3remote(PacpusSocket * socket);
+        PS3remote(PacpusUDPSocket *socket);
             ~PS3remote();
             void run();
@@ -38 +39 @@
             void modeChar();
             void modeJoystick();
-            void checkMode();       
-            
+            void checkMode();
+
         private:
             ShMem *shmem;
@@ -45 +46 @@
             QMutex mutex;
             int quit;
-            PacpusSocket * socket_;
+            PacpusUDPSocket * socket_;
             QTimer * timer_;
             char buf[4];

trunk/Wifibot/wifibot.cpp

@@ -5 +5 @@
 //  author:     Pierre Hudelaine
 //              Copyright Heudiasyc UMR UTC/CNRS 7253
-// 
+//
 //  version:    $Id: $
 //
@@ -22 +22 @@
 // Construct the factory
 //////////////////////////////////////////////////////////////////////////
-static ComponentFactory <Wifibot> sFactory("Wifibot");  
+static ComponentFactory <Wifibot> sFactory("Wifibot");
 
 //////////////////////////////////////////////////////////////////////////
@@ -28 +28 @@
 //////////////////////////////////////////////////////////////////////////
 Wifibot::Wifibot(QString name)
-    : ComponentBase( name ) 
+    : ComponentBase( name )
 {
-  
-} 
+
+}
 
 
@@ -37 +37 @@
 // Destructor
 //////////////////////////////////////////////////////////////////////////
-Wifibot::~Wifibot() 
+Wifibot::~Wifibot()
 {
-  
+
 }
 
 //////////////////////////////////////////////////////////////////////////
-// Called by the ComponentManager to pass the XML parameters to the 
-// component 
+// Called by the ComponentManager to pass the XML parameters to the
+// component
 //////////////////////////////////////////////////////////////////////////
-ComponentBase::COMPONENT_CONFIGURATION  Wifibot::configureComponent( XmlComponentConfig config ) 
-{ 
+ComponentBase::COMPONENT_CONFIGURATION  Wifibot::configureComponent( XmlComponentConfig config )
+{
     QString pacpusSocket = config.getProperty("socketComponent");
-    ComponentManager * mgr = ComponentManager::getInstance();
-    pacpusSocket_ = dynamic_cast<PacpusSocket *>(mgr->getComponent(pacpusSocket));
+    //ComponentManager * mgr = ComponentManager::getInstance();
+    pacpusSocket_ = dynamic_cast<PacpusUDPSocket *>(ComponentManager::getInstance()->getComponent(pacpusSocket).get());
     if (!pacpusSocket_) {
             qWarning() << "Failed to get component " << pacpusSocket;
             return ComponentBase::NOT_CONFIGURED;
     }
-  
-    return ComponentBase::CONFIGURED_OK; 
-} 
+
+    return ComponentBase::CONFIGURED_OK;
+}
 
 
@@ -64 +64 @@
 // Called by the ComponentManager to start the component
 //////////////////////////////////////////////////////////////////////////
-void Wifibot::startActivity() 
-{ 
+void Wifibot::startActivity()
+{
     dualshock = new PS3remote(pacpusSocket_);
     dualshock->start();

trunk/Wifibot/wifibot.h

@@ -5 +5 @@
 //  author:     Pierre Hudelaine
 //              Copyright Heudiasyc UMR UTC/CNRS 7253
-// 
+//
 //  version:    $Id: $
 //
@@ -12 +12 @@
 *********************************************************************/
 #ifndef WIFIBOT_API
-# define WIFIBOT_API 
+# define WIFIBOT_API
 
 #include "ps3remote.h"
 #include "Pacpus/kernel/Log.h"
-#include "Pacpus/kernel/ComponentBase.h" 
-#include "Pacpus/kernel/ComponentFactory.h" 
-
+#include "Pacpus/kernel/ComponentBase.h"
+#include "Pacpus/kernel/ComponentFactory.h"
+#include "Pacpus/kernel/ComponentManager.h"
 
 namespace pacpus {
@@ -24 +24 @@
 class WIFIBOT_API Wifibot
         : public QObject
-        , public ComponentBase 
-{ 
+        , public ComponentBase
+{
   Q_OBJECT
 
-public: 
+public:
     /// Constructor
     Wifibot (QString name);
     /// Destructor
     ~Wifibot();
-    
+
 protected:
     // The 3 virtual methods relative to the ComponentBase inheritance
@@ -39 +39 @@
     virtual void stopActivity();
     virtual COMPONENT_CONFIGURATION configureComponent (XmlComponentConfig config);
-    
+
 private:
     PS3remote * dualshock;
-    PacpusSocket * pacpusSocket_;
+    PacpusUDPSocket * pacpusSocket_;
 };
 

trunk/build/build_linux.sh

@@ -7 +7 @@
 else 
 
+        # the following line will create a folder like: build_opt_pacpus_0.2.0_
         BUILD_DIR=./build${PACPUS_ROOT////_}
         echo Your files will be built in: $BUILD_DIR
@@ -25 +26 @@
         cd $BUILD_DIR
 
-        cmake ../..
+        cmake ../.. -G "CodeBlocks - Unix Makefiles"
 
         make -j$J
-        make install
+  make install
 
 fi

trunk/driver/PosixSerialPort.cpp

@@ -4 +4 @@
 //
 // author:     Gerald Dherbomez
-// 
+//
 // version:    $Id: $
 //
@@ -24 +24 @@
 
 PosixSerialPort::~PosixSerialPort() {
-    qDebug() << "The win32 serial port " << componentName << " was destroyed";
+    qDebug() << "The Posix serial port " << componentName << " was destroyed";
 }
 
 PosixSerialPort::PosixSerialPort(QString name) {
-
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// return the number of frames that have not been yet decoded 
+    componentName = name;
+    qDebug() << "The Posix serial port " << componentName << " was created";
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+// return the number of frames that have not been yet decoded
 //////////////////////////////////////////////////////////////////////////
 
@@ -45 +46 @@
 
 //////////////////////////////////////////////////////////////////////////
-// return a pointer to the first frame in the list 
+// return a pointer to the first frame in the list
 //////////////////////////////////////////////////////////////////////////
 
@@ -53 +54 @@
 
 
-
-
-
-//////////////////////////////////////////////////////////////////////////
-// remove the first frame of the list 
-// use this function as soon as you copy the frame 
+//////////////////////////////////////////////////////////////////////////
+// return a pointer to the first frame in the queue and removes it
+// The reader is responsible for deleting the frame.
+//////////////////////////////////////////////////////////////////////////
+FRAME * PosixSerialPort::getNextFrame()
+{
+    FRAME *frame = NULL;
+    frameLock_.lock();
+    if (!dataFrameList.isEmpty()) {
+        frame = dataFrameList.takeFirst();
+    }
+    frameLock_.unlock();
+    return frame;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+// remove the first frame of the list
+// use this function as soon as you copy the frame
 //////////////////////////////////////////////////////////////////////////
 
@@ -70 +84 @@
     }
     dataFrameList.removeFirst();
-    delete[] tmp->data;
+    //delete[] tmp->data;
     delete tmp;
     tmp = NULL;
@@ -80 +94 @@
 
 /*!< open the port 'name'
-return true if success 
+return true if success
  */
 bool PosixSerialPort::openPort(const char * name) {
@@ -96 +110 @@
 
 /*!< close the port
-return true if success 
+return true if success
  */
 int PosixSerialPort::closePort() {
@@ -102 +116 @@
 }
 
-/*!< configure the port 
-return true if success 
+/*!< configure the port
+return true if success
  */
 int PosixSerialPort::configurePort(long baudRate, int byteSize, char parity, int stopBits) {
@@ -116 +130 @@
             cfsetospeed(&port_settings, B4800);
             break;
-          
+
         case 9600:
             cfsetispeed(&port_settings, B9600); // set baud rates
@@ -145 +159 @@
 
 //////////////////////////////////////////////////////////////////////////
-// Read 'maxLength' bytes on the port and copy them in buffer 
+// Read 'maxLength' bytes on the port and copy them in buffer
 // return the number of bytes read
 //////////////////////////////////////////////////////////////////////////
@@ -167 +181 @@
       memset(receivedBuffer_,0,numberBytesToRead);
       numberBytesRead = readBuffer(receivedBuffer_,numberBytesToRead);
-      processIncomingData(); 
+      processIncomingData();
     }
     else
     {
-      receivedBuffer_ = NULL; 
-      // todo : trouver une autre methode plus efficace que le polling et le sleep ! 
+      receivedBuffer_ = NULL;
+      // todo : trouver une autre methode plus efficace que le polling et le sleep !
       usleep(1000);
     }
@@ -184 +198 @@
 
     ioctl(handlePort, FIONREAD, &bytes);
-    
+
     return bytes;
 }
@@ -195 +209 @@
     // data frame
     if (numberBytesRead > 0) {
-    FRAME * frame = new FRAME; 
-    frame->t = t_; 
-    frame->tr = 0; 
-    frame->length = numberBytesRead; 
-    frame->data = new char[frame->length]; 
-    memcpy(frame->data, receivedBuffer_, frame->length); 
-    
-    frameLock_.lock(); 
-    dataFrameList.append( frame );   
-    frameLock_.unlock();
-
-    //printf(receivedBuffer_); 
-    emit newDataAvailable(1); 
-    delete[] receivedBuffer_; 
+    FRAME * frame = new FRAME;
+    frame->t = t_;
+    frame->tr = 0;
+    frame->length = numberBytesRead;
+    frame->data = QByteArray(receivedBuffer_, frame->length);
+
+    frameLock_.lock();
+    dataFrameList.append( frame );
+    frameLock_.unlock();
+
+    //printf(receivedBuffer_);
+    emit newDataAvailable(1);
+    delete[] receivedBuffer_;
     receivedBuffer_ = NULL;
   }
@@ -214 +227 @@
   if (ringIndicatorDetected) {
     ringIndicatorDetected = false;
-    FRAME * frame = new FRAME; 
-    frame->t = t_; 
-    frame->tr = 0; 
-    frame->length = 3; 
-    frame->data = new char[frame->length]; 
-    memcpy(frame->data, "PPS", frame->length); 
-    frameLock_.lock(); 
-    dataFrameList.append(frame); 
-    frameLock_.unlock();
-
-    emit newDataAvailable(1); 
+    FRAME * frame = new FRAME;
+    frame->t = t_;
+    frame->tr = 0;
+    frame->length = 3;
+    frame->data = frame->data = QByteArray("PPS", frame->length);
+
+    frameLock_.lock();
+    dataFrameList.append(frame);
+    frameLock_.unlock();
+
+    emit newDataAvailable(1);
   }
 
   // re-initialization
   t_ = 0;
-  numberBytesToRead = 0; 
-} 
+  numberBytesToRead = 0;
+}

trunk/driver/PosixSerialPort.h

@@ -34 +34 @@
   road_timerange_t tr; 
   unsigned long length;
-  char * data; 
+  QByteArray data; //char *
 }FRAME; 
 
@@ -51 +51 @@
   /*!< return the first dataFrame in the list */
   FRAME* firstFrame(); 
+
+  /*!< return the next dataFrame in the list and removes it */
+  FRAME* getNextFrame();
 
   /*!< remove the first dataFrame in the list */