Changeset 148 in pacpusframework for branches/2.0-beta1/include/Pacpus/kernel/InputOutputBase.h

Timestamp:

07/31/13 14:42:05 (11 years ago)

Author:

Marek Kurdej

Message:

Corrections in PacpusEvent, InputOutputBase, InputOutputInterface.
Fixed: DLL import/export in geodesie.h.

File:

• branches/2.0-beta1/include/Pacpus/kernel/InputOutputBase.h (modified) (5 diffs)

branches/2.0-beta1/include/Pacpus/kernel/InputOutputBase.h

@@ -7 +7 @@
 
 #include <QApplication>
+#include <QList>
+#include <QString>
+#include <QStringList>
 #include <typeinfo>
-#include <QList>
-#include <QStringList>
 
 namespace pacpus {
@@ -15 +16 @@
 class ComponentBase;
 
-class PACPUSLIB_API AbstractInterface : public QObject
+class PACPUSLIB_API AbstractInterface
+    : public QObject
 {
      Q_OBJECT
+
 protected:
-    AbstractInterface(QString name, ComponentBase * component, QObject * parent = 0):_name(name),_component(component),QObject(parent) {}
-    ~AbstractInterface(){}
+    AbstractInterface(QString name, ComponentBase * component, QObject * parent = 0)
+        : m_name(name)
+        , m_component(component)
+        , QObject(parent)
+    {}
+
+    ~AbstractInterface()
+    {}
+
 public:
     QString getSignature();
-    QString getName() {return _name;}
+    QString getName()
+    {
+        return m_name;
+    }
+    
     virtual QString getDataType() = 0;
-    ComponentBase * getComponent() {return _component;}
-
-    void addConnection(ConnectionBase connection) { _connection.append(connection);}
-    bool removeConnection(ConnectionBase connection) { return _connection.removeOne(connection);}
-
-    bool hasConnection() { return _connection.size() > 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;
+    }
+    
 protected:
-    QString _name;
-    ComponentBase * _component;
-    QList<ConnectionBase> _connection;
+    QList<ConnectionBase> & connections()
+    {
+        return m_connections;
+    }
+
+    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;
+    }
+    
+private:
+    QString m_name;
+    ComponentBase * m_component;
+    QList<ConnectionBase> m_connections;
 };
 
-class PACPUSLIB_API InputInterfaceBase : public AbstractInterface
+class PACPUSLIB_API InputInterfaceBase
+    : public AbstractInterface
 {
     Q_OBJECT
 protected:
-    InputInterfaceBase(QString name, ComponentBase * component, QObject * parent = 0):AbstractInterface(name,component,parent) {}
+    InputInterfaceBase(QString name, ComponentBase * component, QObject * parent = 0)
+        : AbstractInterface(name, component, parent)
+    {}
 
 public:
     //InputInterfaceBase(QString name, ComponentBase * component,int a, QObject * parent = 0):AbstractInterface(name,component,parent) {} // TODO add ctor with function pointer
 
-            enum ReadingMode {
+    enum ReadingMode {
         NeverSkip,
         TimeBounded,
@@ -53 +110 @@
     };
 
-    virtual ~InputInterfaceBase(){}
-
-    virtual void customEvent(QEvent* e) {
-
+    virtual ~InputInterfaceBase()
+    {}
+
+    virtual void 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
-    }
-
-    void setReadingMode(ReadingMode mode) { readingMode_ = mode;}
-    virtual PacpusEvent* getEventTemplate() {return new PacpusEvent(GENERIC_EVENT);} // TODO check ??
-protected:
-            ReadingMode readingMode_;
+        //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
+    }
+
+    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);
+    }
+    
 private:
-        // metode(QByteArray)
-
-        //QQueue jobQueue_;
+    ReadingMode m_readingMode;
+
+    // metode(QByteArray)
+    //QQueue jobQueue_;
 };
 
-class PACPUSLIB_API OutputInterfaceBase: public AbstractInterface
+class PACPUSLIB_API OutputInterfaceBase
+    : public AbstractInterface
 {
     Q_OBJECT
 
 public:
-    OutputInterfaceBase(QString name, ComponentBase * component, QObject * parent = 0):AbstractInterface(name,component,parent) {}
-
-    virtual ~OutputInterfaceBase(){}
-
-    QStringList getInputConnectedList() {
+    OutputInterfaceBase(QString name, ComponentBase * component, QObject * parent = 0)
+        : AbstractInterface(name, component, parent)
+    {}
+
+    virtual ~OutputInterfaceBase()
+    {}
+
+    QStringList getInputConnectedList()
+    {
         QStringList list;
-        for(QList<ConnectionBase>::iterator it = _connection.begin(); it!=_connection.end(); ++it)
+        for(QList<ConnectionBase>::iterator it = connections().begin(); it != connections().end(); ++it) {
             list.append(it->getInterface()->getName());
+        }
         return list;
     }
 
-    void send(/*const*/ QByteArray & data) {
+    void send(/*const*/ QByteArray & data)
+    {
         // TODO check at least one Typed connection
 
-        for(QList<ConnectionBase>::iterator it = _connection.begin(); it!=_connection.end(); ++it){
+        for(QList<ConnectionBase>::iterator it = connections().begin(); it!=connections().end(); ++it){
                 QDataStream in(&data,QIODevice::ReadOnly);
-                PacpusEvent* event = dynamic_cast<InputInterfaceBase*>(_connection.at(0).getInterface())->getEventTemplate();
+                PacpusEvent* event = dynamic_cast<InputInterfaceBase*>(connections().at(0).getInterface())->getEventTemplate();
                 event->streamIn(in);
                 QApplication::postEvent(it->getInterface(),event,it->getPriority());
         }
-
-
     }
 
@@ -111 +192 @@
 {
     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
@@ -119 +199 @@
         return true;
     } else {
-   //LOG_WARN("connecting " << out->getSignature() << ":" << out->getDataType() << " to " << in->getSignature() << ":" << in->getDataType() << " failled : DataType incompatible " <<  QString(typeid(QByteArray).name()));
-   return false;
+        //LOG_WARN("connecting " << out->getSignature() << ":" << out->getDataType() << " to " << in->getSignature() << ":" << in->getDataType() << " failled : DataType incompatible " <<  QString(typeid(QByteArray).name()));
+        return false;
     }
 }