Changeset 121 in pacpusframework for branches

Timestamp:

Jul 19, 2013, 12:42:35 PM (11 years ago)

Author:

morasjul

Message:

add cmake macro
and improve serial component

Location:

branches/2.0-beta1

Files:

• cmake/PacpusUtilities.cmake (modified) (5 diffs)
• include/Pacpus/PacpusTools/PacpusSerialPort.h (modified) (1 diff)
• src/PacpusLib/CMakeLists.txt (modified) (2 diffs)
• src/PacpusTools/src/PacpusSerialPort.cpp (modified) (3 diffs)

branches/2.0-beta1/cmake/PacpusUtilities.cmake

@@ -13 +13 @@
 ## Qt macro compatibility Qt4 / Qt5
 ## ========================================
-#function(qt_wrap_moc MOC_SRCS FILES_TO_MOC)
-
-#    if(QT4_FOUNDED)
-#        qt4_wrap_cpp(TEMP_VAR ${FILES_TO_MOC})
-
-#    elseif(Qt5Core_FOUND)
-#        qt5_wrap_cpp(${MOC_SRCS} ${FILES_TO_MOC} PARENT_SCOPE)
-
-#    else()
-#        message(WARNING "QT ui found, can't wrap moc File")
-#    endif()
-
-#    #set(${MOC_SRCS} ${TEMP_VAR} PARENT_SCOPE)
-
-#endfunction(qt_wrap_moc)
+function(qt_wrap_cpp OUT_MOC_SRCS FILES_TO_MOC)
+
+    if(QT4_FOUNDED)
+        qt4_wrap_cpp(MOC_SRCS ${FILES_TO_MOC})
+
+    elseif(Qt5Core_FOUND)
+        qt5_wrap_cpp(MOC_SRCS ${FILES_TO_MOC})
+
+    else()
+        message(WARNING "QT not found, can't wrap moc File")
+    endif()
+
+    set(${OUT_MOC_SRCS} ${MOC_SRCS} PARENT_SCOPE)
+
+endfunction(qt_wrap_cpp)
 
 ## ========================================
 ## Qt macro compatibility Qt4 / Qt5
 ## ========================================
-#function(qt_wrap_ui UI_SRCS UI_FILES)
-#    if(QT4_FOUND)
-#        qt4_wrap_ui( TEMP_VAR ${UI_FILES})
-
-#    elseif(Qt5Core_FOUND)
-#        qt5_wrap_ui( TEMP_VAR ${UI_FILES})
-
-#    else()
-#        message(WARNING "QT ui found, can't wrap ui File")
-#    endif()
-
-#    set(${UI_SRCS} ${TEMP_VAR} PARENT_SCOPE)
-#endfunction()
+function(qt_wrap_ui OUT_UI_SRCS UI_FILES)
+    if(QT4_FOUND)
+        qt4_wrap_ui( UI_SRCS ${UI_FILES})
+
+    elseif(Qt5Core_FOUND)
+        qt5_wrap_ui( UI_SRCS ${UI_FILES})
+
+    else()
+        message(WARNING "QT not found, can't wrap ui File")
+    endif()
+
+    set(${OUT_UI_SRCS} ${UI_SRCS} PARENT_SCOPE)
+
+endfunction()
 
 # ========================================
@@ -53 +54 @@
     if(QT4_FOUND)
         pacpus_plugin_qt4(PLUGIN_CPP PLUGIN_H ${PROJECT_NAME} )
+        #message("Create QT4 Plugin")
 
     elseif(Qt5Core_FOUND)
@@ -61 +63 @@
     endif()
 
+    set(${OUT_CPP} ${PLUGIN_CPP} PARENT_SCOPE)
+    set(${OUT_H} ${PLUGIN_H} PARENT_SCOPE)
 
 endfunction(PACPUS_PLUGIN)
@@ -162 +166 @@
         "    Q_OBJECT\n"
         "    //Qt5 Plugins Macro\n"
-        "    Q_PLUGIN_METADATA(IID \"papus.pacpuscityvip." ${PLUGIN_NAME} "\" FILE \"" ${PLUGIN_NAME} ".json\")\n"
+        "    Q_PLUGIN_METADATA(IID \"papus." ${PLUGIN_NAME} "\" FILE \"" ${PLUGIN_NAME} ".json\")\n"
         "    Q_INTERFACES(PacpusPluginInterface)\n"    
         "\n"
@@ -366 +370 @@
   SET(${result} ${dirlist})
 ENDMACRO()
+
+
+# ========================================
+# Create export header for plugins
+# ========================================
+function(CREATE_EXPORT OUT_H PLUGIN_NAME)
+
+    set(${OUT_H} "export_${PLUGIN_NAME}.h" PARENT_SCOPE)
+
+    string(TOUPPER ${PLUGIN_NAME} PLUGIN_NAME_UPPER)
+
+    # create the header file
+    file(WRITE "export_${PLUGIN_NAME}.h"
+        "// Autogenerated file by PacpusUtilities.cmake\n"
+        "// DO NOT EDIT!!! ALL CHANGES WOULD BE REMOVED BY THE NEXT CALL OF CMAKE\n"
+        "\n"
+
+        "#ifndef __EXPORT_${PLUGIN_NAME_UPPER}__H__\n"
+        "#define __EXPORT_${PLUGIN_NAME_UPPER}_H__\n"
+        "\n"
+        "// Export macro for use DLL for Windows only\n"
+        "#ifdef WIN32\n"
+        "#   ifdef ${PLUGIN_NAME_UPPER}_EXPORT\n"
+        "//      make DLL\n"
+        "#       define ${PLUGIN_NAME_UPPER}_API __declspec(dllexport)\n"
+        "#   else\n"
+        "//      use DLL\n"
+        "#       define ${PLUGIN_NAME_UPPER}_API __declspec(dllimport)\n"
+        "#   endif\n"
+        "#else\n"
+        "//      On other platforms, simply ignore this\n"
+        "#       define ${PLUGIN_NAME_UPPER}_API\n"
+        "//#endif\n"
+
+        "#endif // __EXPORT_${PLUGIN_NAME_UPPER}_H__\n"
+        )
+endfunction(CREATE_EXPORT)

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

@@ -62 +62 @@
 
     QString sepChar;
+    QString startChar;
+    QString stopChar;
 
 

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

@@ -65 +65 @@
     ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/inputOutputInterface.h
     ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/PacpusEvent.h
-    #${PACPUS_INCLUDE_DIR}/Pacpus/kernel/pacpusStruct.h
+    ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/pacpusStruct.h
 
     ./ComponentBase.cpp
@@ -75 +75 @@
     ./XmlConfigFile.cpp
     ./inputOutputBase.cpp
-    #./pacpusStruct.cpp
+    ./pacpusStruct.cpp
 )
 

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

@@ -42 +42 @@
     sepChar = "\n";
 
+    startChar = "$";
+    stopChar = "\n";
+
     // Or threaded
     connect(serialPort,SIGNAL(readyRead()),this,SLOT(readData()));
@@ -101 +104 @@
     sepChar =  param.getProperty("sepChar");
 
+    if(param.hasProperty("startChar"))
+    startChar =  param.getProperty("startChar");
+
+    if(param.hasProperty("stopChar"))
+    stopChar =  param.getProperty("stopChar");
+
     serialPort->setPortName(portName);
 
     if(!serialPort->setBaudRate(baudRate,direction))
-        LOG_ERROR("n° "<< serialPort->error());
+        LOG_ERROR(getName() << "\t error n° "<< serialPort->error());
     if(!serialPort->setDataBits(dataBits))
-        LOG_ERROR("n° "<< serialPort->error());
+        LOG_ERROR(getName() << "\t error n° "<< serialPort->error());
     if(!serialPort->setParity(parity))
-        LOG_ERROR("n° "<< serialPort->error());
+        LOG_ERROR(getName() << "\t error n° "<< serialPort->error());
     if(!serialPort->setStopBits(stopBits))
-        LOG_ERROR("n° "<< serialPort->error());
+        LOG_ERROR(getName() << "\t error n° "<< serialPort->error());
     if(!serialPort->setFlowControl(flowControl))
-        LOG_ERROR("n° "<< serialPort->error());
+        LOG_ERROR(getName() << "\t error n° "<< serialPort->error());
     if(!serialPort->setDataErrorPolicy(errorPolicy))
-        LOG_ERROR("n° "<< serialPort->error());
+        LOG_ERROR(getName() << "\t error n° "<< serialPort->error());
 
     // For futher developpements
@@ -160 +169 @@
     {
         setState(MONITOR_OK);
-        LOG_DEBUG("Serial write performed")
+        LOG_DEBUG(getName() << " Serial write performed")
     }
     else
      {
         setState(MONITOR_NOK);
-        LOG_WARN("Serial write error")
+        LOG_WARN(getName() << " Serial write error")
     }
 }