Changeset 207 in pacpusframework

Timestamp:

10/31/13 09:48:29 (11 years ago)

Author:

Marek Kurdej

Message:

Fixed bug in createConnection.

Location:

trunk

Files:

• include/Pacpus/kernel/ComponentManager.h (modified) (2 diffs)
• src/PacpusLib/ComponentManager.cpp (modified) (4 diffs)

trunk/include/Pacpus/kernel/ComponentManager.h

@@ -83 +83 @@
      * @return True if the component exists and has been started, otherwise false.
      */
-    bool start(const QString& component);
+    bool start(const QString & component);
 
     /** Stop all the components
@@ -119 +119 @@
     bool createComponent(const QString& type, const QString& name);
 
-    bool checkComponentConnection(const QString& componentName, const QString& connectionName);
+    bool checkComponent(const QString & componentName);
+    bool checkComponentInput(const QString & componentName, const QString & inputName);
+    bool checkComponentOutput(const QString & componentName, const QString & outputName);
+
     bool createConnection(const QString& type, const QString& name, const QString& , int );
 

trunk/src/PacpusLib/ComponentManager.cpp

@@ -21 +21 @@
 
 using namespace pacpus;
-
-//template <typename _Elem, typename _Traits, typename _ListElem>
-//std::basic_ostream<_Elem, _Traits> & operator<<(std::basic_ostream<_Elem, _Traits> & os, const QList<_ListElem> & list)
-//{
-//    typedef QList<_ListElem> ListType;
-//    for (ListType::const_iterator it = list.cbegin(), itend = list.cend(); it != itend; ++it) {
-//        os << *it << "\n";
-//    }
-//    return os;
-//}
 
 template <typename _Elem, typename _Traits, typename _ListElem>
@@ -246 +236 @@
 }
 
-bool ComponentManager::checkComponentConnection(const QString& componentName, const QString& connectionName)
+bool ComponentManager::checkComponent(const QString & componentName)
 {
     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);
+        LOG_WARN("component " << componentName << " does not exist");
+        return false;
+    }
+    return true;
+}
+
+bool ComponentManager::checkComponentInput(const QString & componentName, const QString & inputName)
+{
+    if (!checkComponent(componentName)) {
+        return false;
+    }
+    if (NULL == getComponent(componentName)->getInput(inputName)) {
+        LOG_WARN("cannot make connection: component " << componentName << " does not have input " << inputName);
+        return false;
+    }
+    return true;
+}
+
+bool ComponentManager::checkComponentOutput(const QString & componentName, const QString & outputName)
+{
+    if (!checkComponent(componentName)) {
+        return false;
+    }
+    if (NULL == getComponent(componentName)->getOutput(outputName)) {
+        LOG_WARN("cannot make connection: component " << componentName << " does not have output " << outputName);
         return false;
     }
@@ -265 +275 @@
     QStringList input  = inputSignature.split(".");
 
-    if (!checkComponentConnection(output[0], output[1])) {
-        return false;
-    }
-    if (!checkComponentConnection(input[0], input[1])) {
+    if (!checkComponentOutput(output[0], output[1])) {
+        return false;
+    }
+    if (!checkComponentInput(input[0], input[1])) {
         return false;
     }
@@ -400 +410 @@
 
         if (!createConnection(connectionOutput, connectionInput, connectionType,connectionPriority)) {
-            LOG_ERROR("cannot create connection '" << connectionOutput+"=>"+connectionInput << "'");
+            LOG_ERROR("cannot create connection '" << connectionOutput + " => " + connectionInput << "'");
             continue;
         }