Changeset 184 in pacpusframework

Timestamp:

Oct 23, 2013, 9:34:23 AM (11 years ago)

Author:

morasjul

Message:

Minor fixes.

Location:

trunk

Files:

• include/Pacpus/kernel/ComponentBase.h (modified) (1 diff)
• include/Pacpus/kernel/ComponentManager.h (modified) (1 diff)
• include/Pacpus/kernel/InputOutputInterface.h (modified) (4 diffs)
• src/PacpusLib/ComponentManager.cpp (modified) (3 diffs)

trunk/include/Pacpus/kernel/ComponentBase.h

@@ -45 +45 @@
 namespace pacpus {
 
-// Forward declarations.
 class ComponentManager;
+
+class InputInterfaceBase;
+class OutputInterfaceBase;
 
 template <typename T, class C>
 class InputInterface;
-
 template <typename T, class C>
 class OutputInterface;

trunk/include/Pacpus/kernel/ComponentManager.h

@@ -119 +119 @@
     bool createComponent(const QString& type, const QString& name);
 
+    bool checkComponentConnection(const QString& componentName, const QString& connectionName);
     bool createConnection(const QString& type, const QString& name, const QString& , int );
 

trunk/include/Pacpus/kernel/InputOutputInterface.h

@@ -39 +39 @@
     }
 
-    void customEvent(QEvent* event)
+    void customEvent(QEvent * event)
     {
         // TODO check component state started
@@ -86 +86 @@
         }
 
-            // Add here new event type if needed
+        // Add here new event type if needed
 
         default:
@@ -112 +112 @@
 {
 public:
-    OutputInterface(QString name, C * component):OutputInterfaceBase(name,component,component) {}
+    OutputInterface(QString name, C * component)
+        :OutputInterfaceBase(name,component,component)
+    {}
     ~OutputInterface() {}
 
     // Used by Components to send data througth typed output
-    void send(const T & data, road_time_t t = road_time(), road_timerange_t tr = 0)
+    void send(const T & data, road_time_t t = road_time(), road_timerange_t tr = 0);
+    
+    void send(const T & data, road_time_t t, road_timerange_t tr)
     {
         // FIXME Data Shared
@@ -138 +142 @@
 };
 
-
 } // namespace pacpus
 

trunk/src/PacpusLib/ComponentManager.cpp

@@ -16 +16 @@
 
 using namespace pacpus;
-using namespace pacpus;
 
 DECLARE_STATIC_LOGGER("pacpus.core.ComponentManager");
@@ -183 +182 @@
 }
 
+bool ComponentManager::checkComponentConnection(const QString& componentName, const QString& connectionName)
+{
+    if (NULL == getComponent(componentName)) {
+        LOG_WARN("cannot make connection : component " << componentName << " not found");
+        return false;
+    }
+    if (NULL == getComponent(componentName)->getOutput(connectionName)) {
+        LOG_WARN("cannot make connection : component " << componentName << " does not have input/output " << connectionName);
+        return false;
+    }
+    return true;
+}
+
 bool ComponentManager::createConnection(const QString& outputSignature, const QString& inputSignature, const QString& type, int priority = 0)
 {
+    // FIXME: use 2 signatures (output component + output connection) instead of 1 separated by a (".") dot
     QStringList output = outputSignature.split(".");
     QStringList input  = inputSignature.split(".");
 
-    if (getComponent(output[0])==NULL) {
-        LOG_WARN("cannot make connection : component " << output[0] << " not found");
-        return false;}
-    if (getComponent(output[0])->getOutput(output[1]) == NULL) {
-        LOG_WARN("cannot make connection : component " << output[0] << " doesn't have output " << output[1]);
-        return false;}
-    if (getComponent(input[0])==NULL) {
-        LOG_WARN("cannot make connection : component " << input[0] << " not found");
-        return false;}
-    if (getComponent(input[0])->getInput(input[1]) == NULL) {
-        LOG_WARN("cannot make connection : component " << input[0] << " doesn't have intput " << input[1]);
-        return false;}
-
+    if (!checkComponentConnection(output[0], output[1])) {
+        return false;
+    }
+    if (!checkComponentConnection(input[0], input[1])) {
+        return false;
+    }
     // NOTE Create communicationInterface if needed ??
     return connectInterface(
@@ -207 +213 @@
         priority
     );
-
 }