Changeset 110 in pacpusframework for branches/2.0-beta1/src/PacpusLib


Ignore:
Timestamp:
Jun 13, 2013, 1:43:39 PM (11 years ago)
Author:
morasjul
Message:

Beta-2 : Fix CMakeList (link), remove useless code and add improvement

Location:
branches/2.0-beta1/src/PacpusLib
Files:
1 deleted
5 edited

Legend:

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

    r99 r110  
    4040# ========================================
    4141link_directories(
    42         ${PROJECT_BINARY_DIR}/../RoadTime
     42    ${PROJECT_BINARY_DIR}/../RoadTime
     43    ${PROJECT_BINARY_DIR}/../FileLib
    4344)
    4445
     
    7374    ./XmlComponentConfig.cpp
    7475    ./XmlConfigFile.cpp
    75     ./inputOutputInterface.cpp
     76    ./inputOutputBase.cpp
    7677)
    7778
     
    9697
    9798if(UNIX)
    98         set(LIBS FileLib)#optimized FileLib debug FileLib_d)
     99        #set(LIBS FileLib)
     100        set(LIBS optimized FileLib debug FileLib_d)
    99101else()
    100     set(LIBS 
     102    set(LIBS
    101103        #optimized ROAD_TIME debug ROAD_TIME_d # TODO why debug not found ?
    102         ROAD_TIME
    103         )
     104        ROAD_TIME
     105        )
    104106endif()
    105107
  • branches/2.0-beta1/src/PacpusLib/ComponentBase.cpp

    r89 r110  
    2020  , mgr(NULL)
    2121  , componentState_(NOT_MONITORED)
     22  , ui(NULL)
    2223{
    2324    LOG_TRACE("constructor");
  • branches/2.0-beta1/src/PacpusLib/ComponentManager.cpp

    r96 r110  
    77#include <Pacpus/kernel/ComponentManager.h>
    88#include <Pacpus/kernel/ComponentBase.h>
     9#include <Pacpus/kernel/ConnectionBase.h>
    910#include <Pacpus/kernel/Log.h>
    10 #include <Pacpus/kernel/ConnectionBase.h>
    1111#include <QObject>
    1212
     
    227227        QString componentType = cfg.getComponentType();
    228228        QString componentName = cfg.getComponentName();
    229         //LOG_DEBUG("try to create component '" << componentName << "'");
     229        LOG_DEBUG("try to create component '" << componentName << "'");
     230
    230231        // create the component and automatically add it to the component manager list
    231232        if (!createComponent(componentType, componentName)) {
     
    239240    // Second, try to configure the components without regarding the dependencies
    240241    for (int i = 0; i < componentsNodeList.size(); ++i) {
    241         //LOG_DEBUG("try to configure component '" << (*it) << "'");
    242242        cfg.localCopy(componentsNodeList.item(i).toElement());
    243243        QString componentName = cfg.getComponentName();
     244        LOG_DEBUG("try to configure component '" << componentName << "'");
    244245
    245246        // copy locally the config parameters of the component
     
    250251            component->param.localCopy(cfg.qDomElement());
    251252            component->configuration_ = component->configureComponent(cfg);
    252 
    253253        }
    254254    } // for
     
    264264        } else {
    265265            if (component->configuration_ == ComponentBase::CONFIGURATION_DELAYED) {
    266                 //LOG_DEBUG("try to configure component '" << (*it) << "'");
     266                LOG_DEBUG("try to configure component '" << componentName << "'");
    267267
    268268                // copy locally the config parameters of the component
     
    274274                --componentsToConfigureCount;
    275275            } else {
    276                 /*LOG_ERROR("cannot configure component '" << (*it) << "'"
     276                LOG_ERROR("cannot configure component '" << componentName << "'"
    277277                          << ". Dependencies with other components are too complex"
    278278                          << ". It was not configured, please review your configuration and/or your component"
    279                           );*/
     279                          );
    280280                component->configuration_ = ComponentBase::CONFIGURED_FAILED;
    281281            }
  • branches/2.0-beta1/src/PacpusLib/XmlComponentConfig.cpp

    r100 r110  
    2020static const string kPropertyConnectionOutput = "output";
    2121static const string kPropertyConnectionPriority = "priority";
    22 static const string kPropertyConnectionInputC = "inputC";
    23 static const string kPropertyConnectionInputP = "inputP";
    24 static const string kPropertyConnectionOutputC = "outputC";
    25 static const string kPropertyConnectionOutputP = "outputP";
     22//static const string kPropertyConnectionInputC = "inputC";
     23//static const string kPropertyConnectionInputP = "inputP";
     24//static const string kPropertyConnectionOutputC = "outputC";
     25//static const string kPropertyConnectionOutputP = "outputP";
    2626
    2727XmlComponentConfig::XmlComponentConfig(const QString& name)
  • branches/2.0-beta1/src/PacpusLib/XmlConfigFile.cpp

    r100 r110  
    7575    _mutex.lock();
    7676// TODO change .tagName => .attribute(kPropertyComponentName.c_str())
    77     if (_document.documentElement().namedItem(componentSection).namedItem(component.tagName()).isNull()) {
    78         LOG_WARN("component " << component.tagName() << " exists already in the document");
     77    if (_document.documentElement().namedItem(componentSection).namedItem(component.attribute(nameAttribute)/*.tagName()*/).isNull()) {
     78        LOG_WARN("component " << component.attribute(nameAttribute)/*tagName()*/ << " exists already in the document");
    7979    } else {
    8080        QDomNode node = _document.documentElement().namedItem(componentSection).appendChild(component);
     
    9292    QDomNode node = _document.documentElement().namedItem(componentSection).removeChild(component);
    9393    if (node.isNull()) {
    94         LOG_WARN("component " << component.tagName() << " doesn't exist in the document.");
     94        LOG_WARN("component " << component.attribute(nameAttribute)/*tagName()*/ << " doesn't exist in the document.");
    9595    } else {
    9696        LOG_INFO("component " << node.nodeName() << " has been removed from the section "
Note: See TracChangeset for help on using the changeset viewer.