Changeset 152 in pacpusframework for branches/2.0-beta1/src/PacpusLib/ComponentManager.cpp

Timestamp:

08/01/13 10:45:50 (11 years ago)

Author:

Marek Kurdej

Message:

Major update.
Renamed: addInput -> addInputs, addOutput -> addOutputs and made pure virtual (=0).
Transformed macro definitions into template methods: ADD_INPUT -> ComponentBase::addInput, ADD_OUTPUT -> ComponentBase::addOutput, GET_INPUT -> ComponentBase::getTypedInput, GET_OUTPUT -> ComponentBase::getTypedOutput.
Fixed: added public/protected set/get methods in ComponentBase, made member fields private.

File:

• branches/2.0-beta1/src/PacpusLib/ComponentManager.cpp (modified) (3 diffs)

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

@@ -254 +254 @@
         } else {
             component->param.localCopy(cfg.qDomElement());
-            component->configuration_ = component->configureComponent(cfg);
+            component->setConfigurationState(component->configureComponent(cfg));
         }
     } // for
@@ -267 +267 @@
             LOG_WARN("component '" << componentName << "' does not exist");
         } else {
-           // Pacpus 2.0 : add input and output
-            component->addInput();
-            component->addOutput();
-
-            if (component->configuration_ == ComponentBase::CONFIGURATION_DELAYED) {
+           // Pacpus 2.0 : add inputs and outputs
+            component->addInputs();
+            component->addOutputs();
+
+            if (ComponentBase::CONFIGURATION_DELAYED == component->configurationState()) {
                 LOG_DEBUG("try to configure component '" << componentName << "'");
 
                 // copy locally the config parameters of the component
                 component->param.localCopy(cfg.qDomElement());
-                component->configuration_ = component->configureComponent(cfg);
+                component->setConfigurationState(component->configureComponent(cfg));
             }
 
-            if (component->configuration_ == ComponentBase::CONFIGURED_OK) {
+            if (ComponentBase::CONFIGURED_OK == component->configurationState()) {
                 --componentsToConfigureCount;
             } else {
@@ -286 +286 @@
                           << ". It was not configured, please review your configuration and/or your component"
                           );
-                component->configuration_ = ComponentBase::CONFIGURED_FAILED;
+                component->setConfigurationState(ComponentBase::CONFIGURED_FAILED);
             }
         }