Changeset 182 in pacpusframework for trunk/include/Pacpus

Timestamp:

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

Author:

Marek Kurdej

Message:

Fixed: dependencies in InputOutputBase, ConnectionBase.

Location:

trunk/include/Pacpus/kernel

Files:

• ComponentBase.h (modified) (1 diff)
• ConnectionBase.h (modified) (1 diff)
• InputOutputBase.h (modified) (6 diffs)
• InputOutputInterface.h (modified) (1 diff)

trunk/include/Pacpus/kernel/ComponentBase.h

@@ -24 +24 @@
 
 #include <Pacpus/kernel/ComponentManager.h>
+#include <Pacpus/kernel/InputOutputBase.h>
 #include <Pacpus/kernel/pacpus.h>
 #include <Pacpus/kernel/XmlComponentConfig.h>
-#include <Pacpus/kernel/InputOutputBase.h>
 
 #include <QString>

trunk/include/Pacpus/kernel/ConnectionBase.h

@@ -11 +11 @@
 {
 public:
-    ConnectionBase(AbstractInterface * interface, int priority)
-        : m_interface(interface)
-        , m_priority(priority)
-    {}
+    ConnectionBase(AbstractInterface * anInterface, int priority);
+    virtual ~ConnectionBase();
 
-    ~ConnectionBase()
-    {}
-
-    AbstractInterface *  getInterface() const
-    {
-        return m_interface;
-    }
-
-    int getPriority() const
-    {
-        return m_priority;
-    }
-
-    bool operator==(ConnectionBase const &c)
-    {
-        return getInterface() == c.getInterface()
-            && getPriority() == c.getPriority()
-            ;
-    }
+    AbstractInterface *  getInterface() const;
+    int getPriority() const;
+    bool operator==(ConnectionBase const & c);
 
 private:

trunk/include/Pacpus/kernel/InputOutputBase.h

@@ -2 +2 @@
 #define IN_OUT_BASE_H
 
+#include <Pacpus/kernel/ConnectionBase.h>
 #include <Pacpus/kernel/Log.h>
 #include <Pacpus/kernel/pacpus.h>
-#include <Pacpus/kernel/ConnectionBase.h>
 #include <Pacpus/kernel/PacpusEvent.h>
 
@@ -23 +23 @@
 
 protected:
-    AbstractInterface(QString name, ComponentBase * component, QObject * parent = 0)
-        : m_name(name)
-        , m_component(component)
-        , QObject(parent)
-    {
-        LOG_DEBUG("constructing abstract connection '" << getName() << "'");
-    }
-
-    ~AbstractInterface()
-    {}
+    AbstractInterface(QString name, ComponentBase * component, QObject * parent = 0);
+    virtual ~AbstractInterface();
 
 public:
-    QString getSignature();
-    QString getName()
-    {
-        return m_name;
-    }
-    
+    QString getSignature() const;
+    QString getName() const;
     virtual QString getDataType() = 0;
     
-    ComponentBase * getComponent()
-    {
-        return m_component;
-    }
-
-    void addConnection(ConnectionBase connection)
-    {
-        m_connections.append(connection);
-    }
-
-    bool removeConnection(ConnectionBase connection)
-    {
-        return m_connections.removeOne(connection);
-    }
-
-    bool hasConnection()
-    {
-        return m_connections.size() > 0;
-    }
+    void addConnection(ConnectionBase connection);
+    bool removeConnection(ConnectionBase connection);
+    bool hasConnection();
     
 protected:
-    QList<ConnectionBase> & connections()
-    {
-        return m_connections;
-    }
+    QList<ConnectionBase> & connections();
+    const QList<ConnectionBase> & getConnections() const;
 
-    const QList<ConnectionBase> & connections() const
-    {
-        return m_connections;
-    }
-
-    QString name()
-    {
-        return m_name;
-    }
-
-    ComponentBase * component()
-    {
-        return m_component;
-    }
-
-    const ComponentBase * component() const
-    {
-        return m_component;
-    }
+    ComponentBase * component();
+    const ComponentBase * getComponent() const;
     
 private:
@@ -101 +54 @@
 
 protected:
-    InputInterfaceBase(QString name, ComponentBase * component, QObject * parent = 0)
-        : AbstractInterface(name, component, parent)
-    {}
+    // TODO: add ctor with function pointer
+    InputInterfaceBase(QString name, ComponentBase * component, QObject * parent = 0);
 
 public:
-    //InputInterfaceBase(QString name, ComponentBase * component,int a, QObject * parent = 0):AbstractInterface(name,component,parent) {} // TODO add ctor with function pointer
-
     enum ReadingMode {
         NeverSkip,
@@ -114 +64 @@
     };
 
-    virtual ~InputInterfaceBase()
-    {}
+    virtual ~InputInterfaceBase();
 
-    // TODO for serealization prupose (not yet implemented !!!)
-    virtual void customEvent(QEvent* e)
-    {
-        //if(event->type())
-        //TODO get event Type anf call callback function
+    virtual void customEvent(QEvent* e);
 
-        PacpusEvent * event = dynamic_cast<PacpusEvent *>(e);
-        QByteArray buf;
-        QDataStream out(&buf, QIODevice::WriteOnly);
-        event->streamOut(out);
-        // Callback QByteArray
-    }
+    ReadingMode & readingMode();
+    const ReadingMode & readingMode() const;
+    void setReadingMode(ReadingMode mode);
 
-    ReadingMode & readingMode()
-    {
-        return m_readingMode;
-    }
-
-    const ReadingMode & readingMode() const
-    {
-        return m_readingMode;
-    }
-
-    void setReadingMode(ReadingMode mode)
-    {
-        m_readingMode = mode;
-    }
-
-    virtual PacpusEvent* getEventTemplate()
-    {
-        // TODO: check
-        return new PacpusEvent(GENERIC_EVENT);
-    }
+    virtual PacpusEvent * getEventTemplate();
     
 private:
@@ -171 +94 @@
     {}
 
-    QStringList getInputConnectedList()
-    {
-        QStringList list;
-        for(QList<ConnectionBase>::iterator it = connections().begin(); it != connections().end(); ++it) {
-            list.append(it->getInterface()->getName());
-        }
-        return list;
-    }
+    QStringList getInputConnectedList();
 
-    // TODO for serealization prupose (not yet implemented !!!)
-    void 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());
-        }
-    }
-
+    // TODO for serialization prupose (not yet implemented !!!)
+    void send(/*const*/ QByteArray & data);
 };
 
-static bool connectInterface(OutputInterfaceBase* out, InputInterfaceBase * in, int priority, InputInterfaceBase::ReadingMode mode = InputInterfaceBase::GetLast)
+namespace {
+
+bool connectInterface(OutputInterfaceBase * out, InputInterfaceBase * in, int priority, InputInterfaceBase::ReadingMode mode = InputInterfaceBase::GetLast);
+
+bool connectInterface(OutputInterfaceBase * out, InputInterfaceBase * in, int priority, InputInterfaceBase::ReadingMode mode)
 {
-    if(out->getDataType() == in->getDataType() || out->getDataType() == QString(typeid(QByteArray).name()) || in->getDataType() == QString(typeid(QByteArray).name())) {
+    if (out->getDataType() == in->getDataType() || out->getDataType() == QString(typeid(QByteArray).name()) || in->getDataType() == QString(typeid(QByteArray).name())) {
         // Add connection
-        out->addConnection(ConnectionBase(in,priority));  // TODO make connect function
-        in->addConnection(ConnectionBase(out,priority));
+        out->addConnection(ConnectionBase(in, priority));  // TODO make connect function
+        in->addConnection(ConnectionBase(out, priority));
         in->setReadingMode(mode);
         //LOG_INFO("connection : Output " << out->getSignature() << " => Input " << in->getSignature());
@@ -210 +119 @@
 }
 
+} // namespace
+
 } // namespace pacpus
 

trunk/include/Pacpus/kernel/InputOutputInterface.h

@@ -42 +42 @@
     {
         // TODO check component state started
-        //if(_component) get state
+        //if (_component) get state
         switch (event->type()) {
         case TYPED_EVENT: