Changeset 96 in pacpusframework for branches/2.0-beta1/src

Timestamp:

May 23, 2013, 12:16:31 PM (11 years ago)

Author:

morasjul

Message:

2.0 minor fixs

Location:

branches/2.0-beta1/src

Files:

• FileLib/CMakeLists.txt (modified) (1 diff)
• PacpusLib/CMakeLists.txt (modified) (2 diffs)
• PacpusLib/ComponentManager.cpp (modified) (1 diff)
• PacpusLib/inputOutputInterface.cpp (modified) (1 diff)

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

@@ -42 +42 @@
 # Libraries
 # ========================================
+if(WIN32)        # TODO find other solution
 target_link_libraries(
     ${PROJECT_NAME}
         PacpusLib
 )
+endif()
 
 # ========================================

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

@@ -88 +88 @@
 )
 
+if(UNIX)
+set(LIBS
+    FileLib
+)
+endif()
+
 # ========================================
 # Libraries
@@ -95 +101 @@
     ${QT_LIBRARIES}
     ${PACPUS_DEPENDENCIES_LIB}
-    #FileLib
+    ${LIBS}
 )
 

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

@@ -196 +196 @@
         return false;}
 
-    OutputInterfaceBase * out = getComponent(output[0])->getOutput(output[1]);
-    InputInterfaceBase * in = getComponent(input[0])->getInput(input[1]);
-
-//    if(in->getDataType() == QString(typeid(QByteArray).name()) && out->getDataType() != QString(typeid(QByteArray).name()))
-
-    if(out->getDataType() == in->getDataType() || out->getDataType() == QString(typeid(QByteArray).name()) || in->getDataType() == QString(typeid(QByteArray).name())) {
-
-        // Add connection
-        out->addConnection(ConnectionBase(in,priority));  // TODO and type argument
-        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;
-    }
-
-    /*
-    FactoryMap::iterator it = factoryMap_.find(type);
-    if (it != factoryMap_.end())
-    {
-      (*it)->addComponent(name);
-      return true;
-    }
-    return false;*/
+    // NOTE Create communicationInterface if needed ??
+
+    return connectInterface(getComponent(output[0])->getOutput(output[1]), getComponent(input[0])->getInput(input[1]), priority);
+
 }
 

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

@@ -13 +13 @@
 
 
-//void OutputInterfaceBase::send2(QVariant val) {
-//    Q_EMIT sendOut(val);
-//}
+
+