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

Timestamp:

Aug 1, 2013, 10:45:50 AM (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.

Location:

branches/2.0-beta1/src/PacpusLib

Files:

• ComponentBase.cpp (modified) (6 diffs)
• ComponentManager.cpp (modified) (3 diffs)

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

@@ -13 +13 @@
 DECLARE_STATIC_LOGGER("pacpus.core.ComponentBase");
 
-ComponentBase::ComponentBase(const QString& name)
-  : componentName(name)
-  , recording(true)
-  , THREAD_ALIVE(true)
-  , mIsActive(false)
-  , mgr(NULL)
-  , componentState_(NOT_MONITORED)
-  , ui(NULL)
+ComponentBase::ComponentBase(const QString& componentName)
+  : m_componentName(componentName)
+  , m_isActive(false)
+  , m_isRecording(true)
+  , m_manager(NULL)
+  , m_ui(NULL)
+  , m_componentState(NOT_MONITORED)
 {
     LOG_TRACE("constructor");
     // Get a pointer on the instance of ComponentManager.
-    mgr = ComponentManager::getInstance();
-    LOG_INFO("component " << componentName << " was created");
+    m_manager = ComponentManager::getInstance();
+    LOG_INFO("component " << name() << " was created");
 }
 
@@ -33 +32 @@
 }
 
+bool ComponentBase::isActive() const
+{
+    return m_isActive;
+}
+
+void ComponentBase::setActive(bool isActive)
+{
+    m_isActive = isActive;
+}
+
+bool ComponentBase::isRecording() const
+{
+    return m_isRecording;
+}
+
+void ComponentBase::setRecording(bool isRecording)
+{
+    m_isRecording = isRecording;
+}
+
+const XmlComponentConfig ComponentBase::xmlParameters() const
+{
+    return param;
+}
+
 int ComponentBase::startComponent()
 {
-    if (mIsActive)
-      return false;
-      
-    mIsActive = true;
+    if (isActive()) {
+        LOG_DEBUG("component already started, cannot (re-)start");
+        return false;
+    }
+
+    setActive(true);
     startActivity();
     
@@ -46 +72 @@
 int ComponentBase::stopComponent()
 {
-    if (!mIsActive)
-      return false;
-
-    mIsActive = false;
+    if (!isActive()) {
+        LOG_DEBUG("component already stopped, cannot (re-)stop");
+        return false;
+    }
+    
+    setActive(false);
     stopActivity();
     
@@ -57 +85 @@
 void ComponentBase::setState(const COMPONENT_STATE state)
 {
-    componentState_ = state;
+    m_componentState = state;
 }
 
@@ -63 +91 @@
 ComponentBase::COMPONENT_STATE ComponentBase::getState()
 {
-    COMPONENT_STATE state = componentState_;
-    if (ComponentBase::NOT_MONITORED != componentState_) {
-        componentState_ = ComponentBase::MONITOR_NOK;
+    COMPONENT_STATE state = m_componentState;
+    if (ComponentBase::NOT_MONITORED != m_componentState) {
+        m_componentState = ComponentBase::MONITOR_NOK;
     }
     return state;
 }
 
+ComponentBase::COMPONENT_CONFIGURATION ComponentBase::configurationState() const
+{
+    return m_configurationState;
+}
+
+void ComponentBase::setConfigurationState(COMPONENT_CONFIGURATION state)
+{
+    m_configurationState = state;
+}
+
 bool ComponentBase::isConfigured() const
 {
-    return configuration_ == CONFIGURED_OK;
+    return (m_configurationState == CONFIGURED_OK);
+}
+
+QString ComponentBase::name() const
+{
+    return m_componentName;
 }
 
 QString ComponentBase::getName() const
 {
-     return componentName;
+    return m_componentName;
+}
+
+ComponentBase::InputsMap & ComponentBase::inputs()
+{
+    return m_inputs;
+}
+
+const ComponentBase::InputsMap & ComponentBase::inputs() const
+{
+    return m_inputs;
+}
+
+ComponentBase::OutputsMap & ComponentBase::outputs()
+{
+    return m_outputs;
+}
+
+const ComponentBase::OutputsMap & ComponentBase::outputs() const
+{
+    return m_outputs;
 }
 
 InputInterfaceBase * ComponentBase::getInput(QString inputName) const
 {
-
-    if(input.contains(inputName))
-        return input[inputName];
-    else {
-        LOG_WARN("Component " << componentName << " does not containt input " << inputName);
-        return NULL;
+    if (inputs().contains(inputName)) {
+        return inputs()[inputName];
     }
+    LOG_WARN("Component " << name() << " does not contain input " << inputName);
+    return NULL;
 }
 
@@ -97 +158 @@
         LOG_INFO("Key : " << keys[i])*/;
 
-    if(output.contains(outputName))
-        return output[outputName];
-    else {
-        LOG_WARN("Component " << componentName << " does not containt output " << outputName);
-        return NULL;
+    if (outputs().contains(outputName)) {
+        return outputs()[outputName];
     }
+    LOG_WARN("Component " << name() << " does not containt output " << outputName);
+    return NULL;
 }
-
-void ComponentBase::addInput()
-{
-
-}
-
-void ComponentBase::addOutput()
-{
-
-}

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);
             }
         }