Changeset 120 in pacpusframework for branches/2.0-beta1/src/PacpusLib

Timestamp:

07/15/13 16:59:37 (11 years ago)

Author:

morasjul

Message:

• add PacpusSerialport (QT 5.1 required)
• add part of QT4 / QT5 cmake script
• fix CMake (link)
• add ComponentBase virtual function addInput() & addOutput() call before component configuration

Location:

branches/2.0-beta1/src/PacpusLib

Files:

• CMakeLists.txt (modified) (5 diffs)
• ComponentBase.cpp (modified) (1 diff)
• ComponentManager.cpp (modified) (2 diffs)

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/CommunicationComponent.h
+    #${PACPUS_INCLUDE_DIR}/Pacpus/kernel/pacpusStruct.h
 
     ./ComponentBase.cpp
@@ -75 +75 @@
     ./XmlConfigFile.cpp
     ./inputOutputBase.cpp
+    #./pacpusStruct.cpp
 )
 
@@ -82 +83 @@
 )
 
- qt5_wrap_cpp(
+qt5_wrap_cpp(
      PROJECT_MOC_SRCS
      ${FILES_TO_MOC}
@@ -97 +98 @@
 
 if(UNIX)
-        set(LIBS optimized FileLib debug FileLib_d)
+    set(OPT_LIBRARIES optimized FileLib debug FileLib_d)
 else()
-    set(LIBS
-        optimized ROAD_TIME debug ROAD_TIME_d
-        )
+    set(OPT_LIBRARIES optimized ROAD_TIME debug ROAD_TIME_d)
 endif()
 
@@ -111 +110 @@
     ${QT_LIBRARIES}
     ${PACPUS_DEPENDENCIES_LIB}
-    ${LIBS}
+    ${OPT_LIBRARIES}
 )
 

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

@@ -104 +104 @@
     }
 }
+
+void ComponentBase::addInput()
+{
+
+}
+
+void ComponentBase::addOutput()
+{
+
+}

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

@@ -263 +263 @@
             LOG_WARN("component '" << componentName << "' does not exist");
         } else {
+           // Pacpus 2.0 : add input and output
+            component->addInput();
+            component->addOutput();
+
             if (component->configuration_ == ComponentBase::CONFIGURATION_DELAYED) {
                 LOG_DEBUG("try to configure component '" << componentName << "'");
@@ -299 +303 @@
         int connectionPriority = cfg.getConnectionPriority();
 
+
+        //TODO set connection mode from string
+
+        //InputInterfaceBase::GetLast;
+        //InputInterfaceBase::NeverSkip;
+        //InputInterfaceBase::TimeBounded;
+
+
         if (!createConnection(connectionOutput, connectionInput, connectionType,connectionPriority)) {
             LOG_ERROR("cannot create connection '" << connectionOutput+"=>"+connectionInput << "'");
             continue;
         }
-    }
+    } // for
 
     return componentMap_.count();