Changeset 162 in pacpusframework for branches/2.0-beta1/src

Timestamp:

Aug 1, 2013, 4:46:07 PM (11 years ago)

Author:

Marek Kurdej

Message:

Update: merged changes from trunk.

Location:

branches/2.0-beta1/src

Files:

• PacpusLib/ComponentManager.cpp (modified) (2 diffs)
• PacpusLib/PacpusApplication.cpp (modified) (2 diffs)
• PacpusLib/XmlComponentConfig.cpp (modified) (2 diffs)
• PacpusSensor/src/main.cpp (modified) (1 diff)
• PacpusSensor/src/ui/pacpusmainwindow.cpp (modified) (1 diff)
• PacpusSensor/src/ui/pacpusmainwindow.h (modified) (1 diff)
• PacpusTools/CMakeLists.txt (modified) (4 diffs)
• PacpusTools/src/AsyncWorkerBase.cpp (modified) (1 diff)
• PacpusTools/src/PeriodicWorker.cpp (modified) (1 diff)
• PacpusTools/src/PosixShMem.cpp (modified) (1 diff)
• PacpusTools/src/Win32ShMem.cpp (modified) (2 diffs)
• PacpusTools/src/geodesie.cpp (modified) (1 diff)
• PacpusTools/src/matrice.cpp (modified) (1 diff)

branches/2.0-beta1/src/PacpusLib/ComponentManager.cpp

@@ -3 +3 @@
 // CECILL-C License, Version 1.0.
 // %pacpus:license}
+/// @author  Gerald Dherbomez <firstname.surname@utc.fr>
 /// @version    $Id: ComponentManager.cpp 76 2013-01-10 17:05:10Z kurdejma $
 
+#include <Pacpus/kernel/ComponentFactoryBase.h>
 #include <Pacpus/kernel/ComponentManager.h>
 #include <Pacpus/kernel/ComponentBase.h>
@@ -10 +12 @@
 #include <Pacpus/kernel/Log.h>
 #include <QObject>
-
 #include <QDomNodeList>
 

branches/2.0-beta1/src/PacpusLib/PacpusApplication.cpp

@@ -9 +9 @@
 /// @copyright Copyright (c) UTC/CNRS Heudiasyc 2006 - 2013. All rights reserved.
 
-#include <Pacpus/kernel/DbiteException.h>
 #include <Pacpus/kernel/Log.h>
 #include <Pacpus/kernel/PacpusApplication.h>
+#include <Pacpus/kernel/PacpusException.h>
 
 using namespace pacpus;
@@ -83 +83 @@
     try {
         return QApplication::notify(receiver, ev);
-    } catch(DbiteException & e) {
+    } catch(PacpusException & e) {
         (void) e; // unused
-        LOG_ERROR("DbiteException thrown:" << e.what());
+        LOG_ERROR("PacpusException thrown:" << e.what());
     } catch(std::exception & e) {
         (void) e; // unused

branches/2.0-beta1/src/PacpusLib/XmlComponentConfig.cpp

@@ -14 +14 @@
 DECLARE_STATIC_LOGGER("pacpus.core.XmlComponentConfig");
 
+// FIXME: const char* instead of const string
 static const string kPropertyComponentName = "name";
 static const string kPropertyComponentType = "type";
@@ -63 +64 @@
 int XmlComponentConfig::delProperty(const QString& name)
 {
-    if (!hasProperty(name))
-    {
+    if (!hasProperty(name)) {
         LOG_WARN("cannot delete compoenent property '" << name << "'"
                  << " of component '" << component_.attribute(kPropertyComponentName.c_str()) << "'"

branches/2.0-beta1/src/PacpusSensor/src/main.cpp

@@ -3 +3 @@
 // CECILL-C License, Version 1.0.
 // %pacpus:license}
+/// @author  Gerald Dherbomez <firstname.surname@utc.fr>
 /// @version    $Id: main.cpp 81 2013-01-11 22:31:02Z kurdejma $
 

branches/2.0-beta1/src/PacpusSensor/src/ui/pacpusmainwindow.cpp

@@ -3 +3 @@
 // CECILL-C License, Version 1.0.
 // %pacpus:license}
+/// @author  Gerald Dherbomez <firstname.surname@utc.fr>
 /// @version    $Id: pacpusmainwindow.cpp 76 2013-01-10 17:05:10Z kurdejma $
 

branches/2.0-beta1/src/PacpusSensor/src/ui/pacpusmainwindow.h

@@ -3 +3 @@
 // CECILL-C License, Version 1.0.
 // %pacpus:license}
-/// @author  Firstname Surname <firstname.surname@utc.fr>
-/// @date    Month, Year
+/// @author  Gerald Dherbomez <firstname.surname@utc.fr>
+/// @date    June, 2006
 /// @version $Id: pacpusmainwindow.h 76 2013-01-10 17:05:10Z kurdejma $
 /// @copyright Copyright (c) UTC/CNRS Heudiasyc 2006 - 2013. All rights reserved.

branches/2.0-beta1/src/PacpusTools/CMakeLists.txt

@@ -9 +9 @@
 project(PacpusTools)
 
+create_export(EXPORT_HDR ${PROJECT_NAME} "${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools")
+
 # ========================================
 # Compiler definitions
 # ========================================
-add_definitions(
-    ${QT_DEFINITIONS}
-    -DPACPUS_TOOLS_EXPORTS
-)
+add_definitions(${QT_DEFINITIONS})
 
 # ========================================
 # Include directories
 # ========================================
-include_directories(
-    ${QT_INCLUDE_DIR}
-)
+include_directories(${QT_INCLUDE_DIR})
+
 # ========================================
 # Link directories
@@ -34 +32 @@
 # List of sources
 # ========================================
-set(
-    PROJECT_SRCS
+set(PROJECT_HDRS
+    ${EXPORT_HDR}
+    ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/AsyncWorkerBase.h
+    ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/BinaryDecoder.h
+    ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/geodesie.h
     ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/matrice.h
-    ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/BinaryDecoder.h
+    ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PeriodicWorker.h
     ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PosixShMem.h
     ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/ShMem.h
-    ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/geodesie.h
     #${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/pacpusStruct.h
     #${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PacpusSerialPort.h
+)
+
+set(PROJECT_SRCS
     ./src/matrice.cpp
     ./src/geodesie.cpp
@@ -53 +56 @@
 # Files to MOC
 # ========================================
-set(
-    FILES_TO_MOC
+set(FILES_TO_MOC
     ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/AsyncWorkerBase.h
     ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PeriodicWorker.h
@@ -98 +100 @@
 # Libraries
 # ========================================
-
 set(OPT_LIBRARIES
     optimized PacpusLib debug PacpusLib_d

branches/2.0-beta1/src/PacpusTools/src/AsyncWorkerBase.cpp

@@ -2 +2 @@
 // This file is part of the PACPUS framework distributed under the
 // CECILL-C License, Version 1.0.
+/// @author  Samuel Gosselin <firstname.surname@utc.fr>
+/// @date    December, 2012
 // %pacpus:license}
 

branches/2.0-beta1/src/PacpusTools/src/PeriodicWorker.cpp

@@ -2 +2 @@
 // This file is part of the PACPUS framework distributed under the
 // CECILL-C License, Version 1.0.
+/// @author  Samuel Gosselin <firstname.surname@utc.fr>
+/// @date    December, 2012
 // %pacpus:license}
 

branches/2.0-beta1/src/PacpusTools/src/PosixShMem.cpp

@@ -2 +2 @@
 // This file is part of the PACPUS framework distributed under the
 // CECILL-C License, Version 1.0.
+/// @author  Gerald Dherbomez <firstname.surname@utc.fr>
+/// @date    January, 2007
 // %pacpus:license}
 

branches/2.0-beta1/src/PacpusTools/src/Win32ShMem.cpp

@@ -2 +2 @@
 // This file is part of the PACPUS framework distributed under the
 // CECILL-C License, Version 1.0.
+/// @author  Gerald Dherbomez <firstname.surname@utc.fr>
+/// @date    January, 2007
 // %pacpus:license}
 
@@ -10 +12 @@
 #include <windows.h>
 
-
 DECLARE_STATIC_LOGGER("pacpus.core.Win32ShMem");
 
+using namespace pacpus;
 using namespace std;
 

branches/2.0-beta1/src/PacpusTools/src/geodesie.cpp

@@ -2 +2 @@
 // This file is part of the PACPUS framework distributed under the
 // CECILL-C License, Version 1.0.
+/// @author  Jean Laneurit <firstname.surname@utc.fr>
+/// @date    April, 2010
 // %pacpus:license}
 

branches/2.0-beta1/src/PacpusTools/src/matrice.cpp

@@ -2 +2 @@
 // This file is part of the PACPUS framework distributed under the
 // CECILL-C License, Version 1.0.
+/// @author  Jean Laneurit <firstname.surname@utc.fr>
+/// @date    April, 2010
 // %pacpus:license}