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


Ignore:
Timestamp:
May 23, 2013, 12:16:31 PM (12 years ago)
Author:
morasjul
Message:

2.0 minor fixs

Location:
branches/2.0-beta1/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/2.0-beta1/src/FileLib/CMakeLists.txt

    r95 r96  
    4242# Libraries
    4343# ========================================
     44if(WIN32)        # TODO find other solution
    4445target_link_libraries(
    4546    ${PROJECT_NAME}
    4647        PacpusLib
    4748)
     49endif()
    4850
    4951# ========================================
  • branches/2.0-beta1/src/PacpusLib/CMakeLists.txt

    r94 r96  
    8888)
    8989
     90if(UNIX)
     91set(LIBS
     92    FileLib
     93)
     94endif()
     95
    9096# ========================================
    9197# Libraries
     
    95101    ${QT_LIBRARIES}
    96102    ${PACPUS_DEPENDENCIES_LIB}
    97     #FileLib
     103    ${LIBS}
    98104)
    99105
  • branches/2.0-beta1/src/PacpusLib/ComponentManager.cpp

    r89 r96  
    196196        return false;}
    197197
    198     OutputInterfaceBase * out = getComponent(output[0])->getOutput(output[1]);
    199     InputInterfaceBase * in = getComponent(input[0])->getInput(input[1]);
    200 
    201 //    if(in->getDataType() == QString(typeid(QByteArray).name()) && out->getDataType() != QString(typeid(QByteArray).name()))
    202 
    203     if(out->getDataType() == in->getDataType() || out->getDataType() == QString(typeid(QByteArray).name()) || in->getDataType() == QString(typeid(QByteArray).name())) {
    204 
    205         // Add connection
    206         out->addConnection(ConnectionBase(in,priority));  // TODO and type argument
    207         LOG_INFO("connection : Output " << out->getSignature() << " => Input " << in->getSignature())
    208         return true;
    209     } else {
    210    LOG_WARN("connecting " << out->getSignature() << ":" << out->getDataType() << " to " << in->getSignature() << ":" << in->getDataType() << " failled : DataType incompatible " <<  QString(typeid(QByteArray).name()));
    211    return false;
    212     }
    213 
    214     /*
    215     FactoryMap::iterator it = factoryMap_.find(type);
    216     if (it != factoryMap_.end())
    217     {
    218       (*it)->addComponent(name);
    219       return true;
    220     }
    221     return false;*/
     198    // NOTE Create communicationInterface if needed ??
     199
     200    return connectInterface(getComponent(output[0])->getOutput(output[1]), getComponent(input[0])->getInput(input[1]), priority);
     201
    222202}
    223203
  • branches/2.0-beta1/src/PacpusLib/inputOutputInterface.cpp

    r89 r96  
    1313
    1414
    15 //void OutputInterfaceBase::send2(QVariant val) {
    16 //    Q_EMIT sendOut(val);
    17 //}
     15
     16
Note: See TracChangeset for help on using the changeset viewer.