Changeset 206 in pacpusframework for trunk/src

Timestamp:

10/30/13 12:26:34 (11 years ago)

Author:

Marek Kurdej

Message:

Major: cleaned connection interfaces.

Location:

trunk/src/PacpusLib

Files:

• ComponentBase.cpp (modified) (1 diff)
• ComponentManager.cpp (modified) (6 diffs)
• ConnectionManager.cpp (modified) (6 diffs)
• InputOutputBase.cpp (modified) (2 diffs)

trunk/src/PacpusLib/ComponentBase.cpp

@@ -214 +214 @@
 OutputInterfaceBase * ComponentBase::getOutput(QString outputName) const
 {
-/*    QList<QString> keys = output.keys();
-    for (int i=0; i<keys.size();++i)
-        LOG_INFO("Key : " << keys[i])*/;
-
     if (outputs().contains(outputName)) {
         return outputs()[outputName];
     }
-    LOG_WARN("Component " << getName() << " does not containt output " << outputName);
+    LOG_WARN("Component " << getName() << " does not contain output " << outputName);
     return NULL;
 }

trunk/src/PacpusLib/ComponentManager.cpp

@@ -22 +22 @@
 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>
 std::basic_ostream<_Elem, _Traits> & operator<<(std::basic_ostream<_Elem, _Traits> & os, const QList<_ListElem> & list)
@@ -36 +46 @@
 ////////////////////////////////////////////////////////////////////////////////
 
+/// Connects OutputInterfaceBase @b out to InputInterfaceBase @b in using given priority and reading mode.
+/// @returns @b true if connection has been added successfully, @b false otherwise.
 bool connectInterface(OutputInterfaceBase * out, InputInterfaceBase * in, int priority, InputInterfaceBase::ReadingMode mode = InputInterfaceBase::GetLast);
 
@@ -42 +54 @@
 bool connectInterface(OutputInterfaceBase * out, InputInterfaceBase * in, int priority, InputInterfaceBase::ReadingMode mode)
 {
-    if ((out->getDataType() == in->getDataType())
-            || (out->getDataType() == typeid(QByteArray))
-            || (in->getDataType() == typeid(QByteArray))) {
-        // Add connection
-        out->addConnection(ConnectionBase(in, priority));  // TODO make connect function
-        in->addConnection(ConnectionBase(out, priority));
-        in->setReadingMode(mode);
-        //LOG_INFO("connection : Output " << out->getSignature() << " => Input " << in->getSignature());
-        return true;
-    } else {
-        //LOG_WARN("connecting " << out->getSignature() << ":" << out->getDataType() << " to " << in->getSignature() << ":" << in->getDataType() << " failled : DataType incompatible " <<  QString(typeid(QByteArray).name()));
-        return false;
-    }
+    // check connections
+    if (!out || !in) {
+        LOG_WARN("null connection");
+        return false;
+    }
+
+    // check if connection type are compatible
+    // FIXME: it should permit an OutputType to be a type conversible to InputType
+    if (out->getDataType() != in->getDataType()) {
+        LOG_WARN("connection types do not match: "
+            << out->getSignature() << "." << out->getDataType().name()
+            << " -> "
+            << in->getSignature() << "." << in->getDataType().name()
+        );
+        return false;
+    }
+    //if ((out->getDataType() == in->getDataType())
+    //        || (out->getDataType() == typeid(QByteArray))
+    //        || (in->getDataType() == typeid(QByteArray))) {
+    
+    // add connection
+    out->addConnection(ConnectionBase(in, priority));  // TODO make connect function
+    in->addConnection(ConnectionBase(out, priority));
+    in->setReadingMode(mode);
+    //LOG_INFO("connection : Output " << out->getSignature() << " => Input " << in->getSignature());
+    return true;
 }
 
@@ -145 +170 @@
     LOG_TRACE("registerComponent(name="<< name << ")");
 
-    if (componentMap_.contains(name))
-    {
+    if (componentMap_.contains(name)) {
         LOG_WARN("cannot register component '" << name << "'. A component with the same name exists already");
         return false;
@@ -235 +259 @@
 }
 
-bool ComponentManager::createConnection(const QString& outputSignature, const QString& inputSignature, const QString& type, int priority = 0)
+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
@@ -247 +271 @@
         return false;
     }
-    // NOTE Create communicationInterface if needed ??
+    // FIXME: Create communicationInterface if needed ??
     return connectInterface(
         getComponent(output[0])->getOutput(output[1]), 

trunk/src/PacpusLib/ConnectionManager.cpp

@@ -1 @@
-
 #include  <Pacpus/kernel/ConnectionManager.h>
 #include  <Pacpus/kernel/Log.h>
@@ -15 +14 @@
 {
     LOG_TRACE("destructor");
-
-
 }
 
@@ -41 +38 @@
     LOG_TRACE(Q_FUNC_INFO);
 
-    ComponentManager *mgr = ComponentManager::getInstance();
-
+    ComponentManager * mgr = ComponentManager::getInstance();
 
     // TODO read XML file and build ConnectionList
     QList<ConnectionDescriptor> ConnectionList;
-    ConnectionList.append(ConnectionDescriptor("testComponent1","image","testComponent2","image","type"));
+    ConnectionList.append(ConnectionDescriptor("testComponent1", "image", "testComponent2", "image", "type"));
 
     ComponentBase * sender, * receiver;
@@ -52 +48 @@
     OutputInterfaceBase * out;
 
-    for(QList<ConnectionDescriptor>::iterator i = ConnectionList.begin(); i != ConnectionList.end(); ++i) {
-
+    for (QList<ConnectionDescriptor>::iterator i = ConnectionList.begin(); i != ConnectionList.end(); ++i) {
         // TODO Handle errors
         sender = mgr->getComponent(i->_outputComponent);
         out = sender->getOutput(i->_outputName);
-
 
         receiver = mgr->getComponent(i->_inputComponent);
@@ -66 +60 @@
         LOG_INFO(" Output " << "out" << " connected to " << "in") // TODO replace out / in
     }
-
 
 //    CledComponent * cledComponent = (CledComponent*) m_component[cName];
@@ -82 +75 @@
 //    in1->setConnection(buffer,true);
 //    out1->setConnection(buffer,true);
-
-
 }
-

trunk/src/PacpusLib/InputOutputBase.cpp

@@ -5 +5 @@
 #include <Pacpus/kernel/InputOutputInterface.h>
 #include <Pacpus/kernel/Log.h>
-
-#include <QApplication>
 
 using namespace pacpus;
@@ -124 +122 @@
 }
 
-// TODO for serialization prupose (not yet implemented !!!)
-void OutputInterfaceBase::send(/*const*/ QByteArray & data)
-{
-    // TODO check at least one Typed connection
-
-    for (QList<ConnectionBase>::iterator it = connections().begin(); it!=connections().end(); ++it) {
-            QDataStream in(&data,QIODevice::ReadOnly);
-            PacpusEvent * event = dynamic_cast<InputInterfaceBase*>(connections().at(0).getInterface())->getEventTemplate();
-            event->streamIn(in);
-            QApplication::postEvent(it->getInterface(),event,it->getPriority());
-    }
-}
+// TODO for serialization purpose (not yet implemented !!!)
+//void OutputInterfaceBase::send(/*const*/ QByteArray & data)
+//{
+//    // TODO check at least one Typed connection
+//
+//    for (QList<ConnectionBase>::iterator it = connections().begin(), itend = connections().end(); it != itend; ++it) {
+//            QDataStream in(&data, QIODevice::ReadOnly);
+//            InputInterfaceBase * interfaceBase
+//                = dynamic_cast<InputInterfaceBase *>(connections().at(0).getInterface());
+//            //AbstractInterface * interfaceBase = connections().at(0).getInterface();
+//            if (!interfaceBase) {
+//                continue;
+//            }
+//            PacpusEvent * event = interfaceBase->getEventTemplate();
+//            if (!event) {
+//                continue;
+//            }
+//            event->streamIn(in);
+//            QCoreApplication::postEvent(
+//                it->getInterface(),
+//                event,
+//                it->getPriority()
+//            );
+//    }
+//}