Changeset 182 in pacpusframework for trunk/src

Timestamp:

10/23/13 09:09:51 (11 years ago)

Author:

Marek Kurdej

Message:

Fixed: dependencies in InputOutputBase, ConnectionBase.

Location:

trunk/src/PacpusLib

Files:

• CMakeLists.txt (modified) (1 diff)
• ComponentBase.cpp (modified) (3 diffs)
• ComponentManager.cpp (modified) (2 diffs)
• ConnectionBase.cpp (added)
• InputOutputBase.cpp (modified) (2 diffs)

trunk/src/PacpusLib/CMakeLists.txt

@@ -71 +71 @@
 
 set(PROJECT_SRCS
-    ./ComponentBase.cpp
-    ./ComponentFactoryBase.cpp
-    ./ComponentManager.cpp
-    ./Log.cpp
-    ./PacpusApplication.cpp
-    ./PacpusException.cpp
-    ./XmlComponentConfig.cpp
-    ./XmlConfigFile.cpp
-    ./InputOutputBase.cpp
- #   ./PacpusStruct.cpp
+    ComponentBase.cpp
+    ComponentFactoryBase.cpp
+    ComponentManager.cpp
+    ConnectionBase.cpp
+    InputOutputBase.cpp
+    Log.cpp
+    PacpusApplication.cpp
+    PacpusException.cpp
+ #   PacpusStruct.cpp
+    XmlComponentConfig.cpp
+    XmlConfigFile.cpp
 )
 

trunk/src/PacpusLib/ComponentBase.cpp

@@ -6 +6 @@
 
 #include <Pacpus/kernel/ComponentBase.h>
+
 #include <Pacpus/kernel/ComponentManager.h>
 #include <Pacpus/kernel/Log.h>
@@ -20 +21 @@
 using namespace std;
 
-std::vector<std::string> convertAttributesToArgumentVector(const QDomNamedNodeMap & attributes);
-void logVariablesMap(boost::program_options::variables_map vm);
+vector<string> convertAttributesToArgumentVector(const QDomNamedNodeMap & attributes);
+void logVariablesMap(po::variables_map vm);
 
 DECLARE_STATIC_LOGGER("pacpus.core.ComponentBase");
 
-ComponentBase::ComponentBase(const QString& componentName)
-  : m_componentName(componentName)
-  , m_isActive(false)
-  , mIsRecording(true)
-  , m_manager(NULL)
-  , m_ui(NULL)
-  , m_componentState(NOT_MONITORED)
-  , mOptionsDescription("Component parameters")
+ComponentBase::ComponentBase(const QString & componentName)
+    : m_componentName(componentName)
+    , m_isActive(false)
+    , mIsRecording(true)
+    , m_manager(NULL)
+    , m_ui(NULL)
+    , m_componentState(NOT_MONITORED)
+    , mOptionsDescription("Component parameters")
 {
     LOG_TRACE("constructor");
@@ -172 +173 @@
 {
 /*    QList<QString> keys = output.keys();
-    for(int i=0; i<keys.size();++i)
+    for (int i=0; i<keys.size();++i)
         LOG_INFO("Key : " << keys[i])*/;
 

trunk/src/PacpusLib/ComponentManager.cpp

@@ -10 +10 @@
 #include <Pacpus/kernel/ComponentBase.h>
 #include <Pacpus/kernel/ConnectionBase.h>
+#include <Pacpus/kernel/InputOutputBase.h>
 #include <Pacpus/kernel/Log.h>
+#include <QDomNodeList>
 #include <QObject>
-#include <QDomNodeList>
-
+
+using namespace pacpus;
 using namespace pacpus;
 
@@ -186 +188 @@
     QStringList input  = inputSignature.split(".");
 
-    if(getComponent(output[0])==NULL) {
+    if (getComponent(output[0])==NULL) {
         LOG_WARN("cannot make connection : component " << output[0] << " not found");
         return false;}
-    if(getComponent(output[0])->getOutput(output[1]) == NULL) {
+    if (getComponent(output[0])->getOutput(output[1]) == NULL) {
         LOG_WARN("cannot make connection : component " << output[0] << " doesn't have output " << output[1]);
         return false;}
-    if(getComponent(input[0])==NULL) {
+    if (getComponent(input[0])==NULL) {
         LOG_WARN("cannot make connection : component " << input[0] << " not found");
         return false;}
-    if(getComponent(input[0])->getInput(input[1]) == NULL) {
+    if (getComponent(input[0])->getInput(input[1]) == NULL) {
         LOG_WARN("cannot make connection : component " << input[0] << " doesn't have intput " << input[1]);
         return false;}
 
     // NOTE Create communicationInterface if needed ??
-
-    return connectInterface(getComponent(output[0])->getOutput(output[1]), getComponent(input[0])->getInput(input[1]), priority);
+    return connectInterface(
+        getComponent(output[0])->getOutput(output[1]), 
+        getComponent(input[0])->getInput(input[1]),
+        priority
+    );
 
 }

trunk/src/PacpusLib/InputOutputBase.cpp

@@ +1 @@
+#include <Pacpus/kernel/InputOutputBase.h>
+
 #include <Pacpus/kernel/ComponentBase.h>
+#include <Pacpus/kernel/ConnectionBase.h>
+#define CONNECT_INTERFACE_EXPORTS
 #include <Pacpus/kernel/InputOutputInterface.h>
+#undef CONNECT_INTERFACE_EXPORTS
 #include <Pacpus/kernel/Log.h>
 
@@ -7 +12 @@
 DECLARE_STATIC_LOGGER("pacpus.core.InputOutputInterface");
 
-QString AbstractInterface::getSignature()
+////////////////////////////////////////////////////////////////////////////////
+
+AbstractInterface::AbstractInterface(QString name, ComponentBase * component, QObject * parent)
+    : m_name(name)
+    , m_component(component)
+    , QObject(parent)
 {
-    return component()->getName() + '.' + name();
+    LOG_DEBUG("constructing abstract connection '" << getName() << "'");
 }
+
+AbstractInterface::~AbstractInterface()
+{}
+
+QString AbstractInterface::getSignature() const
+{
+    return getComponent()->getName() + '.' + getName();
+}
+
+QString AbstractInterface::getName() const
+{
+    return m_name;
+}
+
+QList<ConnectionBase> & AbstractInterface::connections()
+{
+    return m_connections;
+}
+
+const QList<ConnectionBase> & AbstractInterface::getConnections() const
+{
+    return m_connections;
+}
+
+ComponentBase * AbstractInterface::component()
+{
+    return m_component;
+}
+
+const ComponentBase * AbstractInterface::getComponent() const
+{
+    return m_component;
+}
+
+void AbstractInterface::addConnection(ConnectionBase connection)
+{
+    m_connections.append(connection);
+}
+
+bool AbstractInterface::removeConnection(ConnectionBase connection)
+{
+    return m_connections.removeOne(connection);
+}
+
+bool AbstractInterface::hasConnection()
+{
+    return m_connections.size() > 0;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+InputInterfaceBase::InputInterfaceBase(QString name, ComponentBase * component, QObject * parent)
+    : AbstractInterface(name, component, parent)
+{}
+
+InputInterfaceBase::~InputInterfaceBase()
+{}
+
+// TODO for serialization prupose (not yet implemented !!!)
+void InputInterfaceBase::customEvent(QEvent* e)
+{
+    //if (event->type())
+    //TODO get event Type anf call callback function
+
+    PacpusEvent * event = dynamic_cast<PacpusEvent *>(e);
+    QByteArray buf;
+    QDataStream out(&buf, QIODevice::WriteOnly);
+    event->streamOut(out);
+    // Callback QByteArray
+}
+
+InputInterfaceBase::ReadingMode & InputInterfaceBase::readingMode()
+{
+    return m_readingMode;
+}
+
+const InputInterfaceBase::ReadingMode & InputInterfaceBase::readingMode() const
+{
+    return m_readingMode;
+}
+
+void InputInterfaceBase::setReadingMode(ReadingMode mode)
+{
+    m_readingMode = mode;
+}
+
+PacpusEvent * InputInterfaceBase::getEventTemplate()
+{
+    // TODO: check
+    return new PacpusEvent(GENERIC_EVENT);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+QStringList OutputInterfaceBase::getInputConnectedList()
+{
+    QStringList list;
+    for (QList<ConnectionBase>::iterator it = connections().begin(); it != connections().end(); ++it) {
+        list.append(it->getInterface()->getName());
+    }
+    return list;
+}
+
+// TODO for serialization prupose (not yet implemented !!!)
+void OutputInterfaceBase::send(/*const*/ QByteArray & data)
+{
+    // TODO check at least one Typed connection
+
+    for (QList<ConnectionBase>::iterator it = connections().begin(); it!=connections().end(); ++it) {
+            QDataStream in(&data,QIODevice::ReadOnly);
+            PacpusEvent * event = dynamic_cast<InputInterfaceBase*>(connections().at(0).getInterface())->getEventTemplate();
+            event->streamIn(in);
+            QApplication::postEvent(it->getInterface(),event,it->getPriority());
+    }
+}