Changeset 110 in pacpusframework for branches/2.0-beta1/src/PacpusLib
- Timestamp:
- Jun 13, 2013, 1:43:39 PM (11 years ago)
- 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 40 40 # ======================================== 41 41 link_directories( 42 ${PROJECT_BINARY_DIR}/../RoadTime 42 ${PROJECT_BINARY_DIR}/../RoadTime 43 ${PROJECT_BINARY_DIR}/../FileLib 43 44 ) 44 45 … … 73 74 ./XmlComponentConfig.cpp 74 75 ./XmlConfigFile.cpp 75 ./inputOutput Interface.cpp76 ./inputOutputBase.cpp 76 77 ) 77 78 … … 96 97 97 98 if(UNIX) 98 set(LIBS FileLib)#optimized FileLib debug FileLib_d) 99 #set(LIBS FileLib) 100 set(LIBS optimized FileLib debug FileLib_d) 99 101 else() 100 set(LIBS 102 set(LIBS 101 103 #optimized ROAD_TIME debug ROAD_TIME_d # TODO why debug not found ? 102 103 104 ROAD_TIME 105 ) 104 106 endif() 105 107 -
branches/2.0-beta1/src/PacpusLib/ComponentBase.cpp
r89 r110 20 20 , mgr(NULL) 21 21 , componentState_(NOT_MONITORED) 22 , ui(NULL) 22 23 { 23 24 LOG_TRACE("constructor"); -
branches/2.0-beta1/src/PacpusLib/ComponentManager.cpp
r96 r110 7 7 #include <Pacpus/kernel/ComponentManager.h> 8 8 #include <Pacpus/kernel/ComponentBase.h> 9 #include <Pacpus/kernel/ConnectionBase.h> 9 10 #include <Pacpus/kernel/Log.h> 10 #include <Pacpus/kernel/ConnectionBase.h>11 11 #include <QObject> 12 12 … … 227 227 QString componentType = cfg.getComponentType(); 228 228 QString componentName = cfg.getComponentName(); 229 //LOG_DEBUG("try to create component '" << componentName << "'"); 229 LOG_DEBUG("try to create component '" << componentName << "'"); 230 230 231 // create the component and automatically add it to the component manager list 231 232 if (!createComponent(componentType, componentName)) { … … 239 240 // Second, try to configure the components without regarding the dependencies 240 241 for (int i = 0; i < componentsNodeList.size(); ++i) { 241 //LOG_DEBUG("try to configure component '" << (*it) << "'");242 242 cfg.localCopy(componentsNodeList.item(i).toElement()); 243 243 QString componentName = cfg.getComponentName(); 244 LOG_DEBUG("try to configure component '" << componentName << "'"); 244 245 245 246 // copy locally the config parameters of the component … … 250 251 component->param.localCopy(cfg.qDomElement()); 251 252 component->configuration_ = component->configureComponent(cfg); 252 253 253 } 254 254 } // for … … 264 264 } else { 265 265 if (component->configuration_ == ComponentBase::CONFIGURATION_DELAYED) { 266 //LOG_DEBUG("try to configure component '" << (*it)<< "'");266 LOG_DEBUG("try to configure component '" << componentName << "'"); 267 267 268 268 // copy locally the config parameters of the component … … 274 274 --componentsToConfigureCount; 275 275 } else { 276 /*LOG_ERROR("cannot configure component '" << (*it)<< "'"276 LOG_ERROR("cannot configure component '" << componentName << "'" 277 277 << ". Dependencies with other components are too complex" 278 278 << ". It was not configured, please review your configuration and/or your component" 279 ); */279 ); 280 280 component->configuration_ = ComponentBase::CONFIGURED_FAILED; 281 281 } -
branches/2.0-beta1/src/PacpusLib/XmlComponentConfig.cpp
r100 r110 20 20 static const string kPropertyConnectionOutput = "output"; 21 21 static 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"; 26 26 27 27 XmlComponentConfig::XmlComponentConfig(const QString& name) -
branches/2.0-beta1/src/PacpusLib/XmlConfigFile.cpp
r100 r110 75 75 _mutex.lock(); 76 76 // 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"); 79 79 } else { 80 80 QDomNode node = _document.documentElement().namedItem(componentSection).appendChild(component); … … 92 92 QDomNode node = _document.documentElement().namedItem(componentSection).removeChild(component); 93 93 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."); 95 95 } else { 96 96 LOG_INFO("component " << node.nodeName() << " has been removed from the section "
Note:
See TracChangeset
for help on using the changeset viewer.