Changeset 96 in pacpusframework

Timestamp:

05/23/13 12:16:31 (11 years ago)

Author:

morasjul

Message:

2.0 minor fixs

Location:

branches/2.0-beta1

Files:

• include/Pacpus/kernel/ConnectionBase.h (modified) (1 diff)
• include/Pacpus/kernel/PacpusEvent.h (modified) (3 diffs)
• include/Pacpus/kernel/inputOutputBase.h (modified) (4 diffs)
• include/Pacpus/kernel/inputOutputInterface.h (modified) (5 diffs)
• src/FileLib/CMakeLists.txt (modified) (1 diff)
• src/PacpusLib/CMakeLists.txt (modified) (2 diffs)
• src/PacpusLib/ComponentManager.cpp (modified) (1 diff)
• src/PacpusLib/inputOutputInterface.cpp (modified) (1 diff)

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

@@ -5 +5 @@
 namespace pacpus {
 
-class InputInterfaceBase;
+class AbstractInterface;
 
 class ConnectionBase
 {
 public:
-    ConnectionBase(InputInterfaceBase * input, int priority):_input(input),_priority(priority) {}
+    ConnectionBase(AbstractInterface * interface, int priority):_interface(interface),_priority(priority) {}
     ~ConnectionBase() {}
 
-    InputInterfaceBase *  getInputInterface() const {return _input;}
+    AbstractInterface *  getInterface() const {return _interface;}
     int getPriority() const {return _priority;}
 
     bool operator== (ConnectionBase const &c) {
-        return _input == c.getInputInterface() && _priority == c.getPriority();}
+        return _interface == c.getInterface() && _priority == c.getPriority();}
 
 private:
-    InputInterfaceBase * _input;
+    AbstractInterface * _interface;
     int _priority;
 };

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

@@ -5 +5 @@
 #include "Pacpus/kernel/road_time.h"
 #include <Pacpus/kernel/pacpus.h>
+#include <QDataStream>
 
 namespace pacpus {
@@ -36 +37 @@
 {
 public:
-    PacpusEvent(QEvent::Type type):QEvent(type) {}
+    PacpusEvent(PacpusEventType type, road_time_t t = road_time(), road_timerange_t tr = 0):QEvent(QEvent::Type(type)),t_(t),tr_(tr) {}
+    virtual ~PacpusEvent() {}
+
+    virtual QDataStream& streamOut(QDataStream& out) {}; // NOTE virtual pure ??
+    virtual QDataStream& streamIn(QDataStream& in) {};
+
+public: // TODO make protected
+    road_time_t t_;
+    road_timerange_t tr_;
 };
 
@@ -43 +52 @@
 {
 public:
-    PacpusTypedEvent(QEvent::Type type, T data, road_time_t t = road_time(), road_timerange_t tr = 0 ):PacpusEvent(type)
-    {_data = data; t_ = t; tr_ = tr;}
+    PacpusTypedEvent(PacpusEventType type, T data = T(), road_time_t t = road_time(), road_timerange_t tr = 0 ):PacpusEvent(type, t, tr),_data(data) {}
     ~PacpusTypedEvent() {}
+
+    QDataStream& streamOut(QDataStream& out) {return out << (quint64)t_ << tr_ /*<<_data*/;} // FIXME Stream Data errors
+    QDataStream& streamIn(QDataStream& in) {return in >> (quint64&)t_ >> tr_ /*>> _data*/;}
+
+public: // TODO make protected
     T _data;
-    road_time_t t_;
-    road_timerange_t tr_;
 };
+
+inline QDataStream& operator << (QDataStream& out, PacpusEvent& ev) {return ev.streamOut(out);}
+inline QDataStream& operator >> (QDataStream& in, PacpusEvent& ev) {return ev.streamIn(in);}
 
 class PACPUSLIB_API PacpusGenericEvent : public PacpusEvent
 {
 public:
-    PacpusGenericEvent(QEvent::Type type, char* data, size_t size):PacpusEvent(type) {
+    PacpusGenericEvent(PacpusEventType type, char* data, size_t size):PacpusEvent(type) {
         _data = (char*)malloc(size);
         memcpy(_data,data,size);

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

@@ -4 +4 @@
 #include <Pacpus/kernel/pacpus.h>
 #include <Pacpus/kernel/ConnectionBase.h>
+#include <Pacpus/kernel/PacpusEvent.h>
 
+#include <QApplication>
 #include <typeinfo>
-#include <QEvent>
 #include <QList>
 #include <QStringList>
@@ -24 +25 @@
     QString getName() {return _name;}
     virtual QString getDataType() = 0;
-    //ComponentBase * getComponent() {return _component;}
+    ComponentBase * getComponent() {return _component;}
+
+    void addConnection(ConnectionBase connection) { _connection.append(connection);}
+    bool removeConnection(ConnectionBase connection) { return _connection.removeOne(connection);}
 
 protected:
     QString _name;
     ComponentBase * _component;
+    QList<ConnectionBase> _connection;
 };
 
@@ -34 +39 @@
 {
     Q_OBJECT
+protected:
+    InputInterfaceBase(QString name, ComponentBase * component, QObject * parent = 0):AbstractInterface(name,component,parent) {}
+
 public:
-    InputInterfaceBase(QString name, ComponentBase * component, QObject * parent = 0):AbstractInterface(name,component,parent) {}
+    //InputInterfaceBase(QString name, ComponentBase * component,int a, QObject * parent = 0):AbstractInterface(name,component,parent) {} // TODO add ctor with function pointer
+
     virtual ~InputInterfaceBase(){}
 
-    virtual void customEvent(QEvent* e) = 0;
+    virtual void customEvent(QEvent* e) {
+
+        //if(event->type())
+            //TODO get event Type anf call callback function
+
+    QByteArray buf;
+    QDataStream out(&buf,QIODevice::WriteOnly);
+    out << e;
+    // Callback QByteArray
+    }
+
+    virtual PacpusEvent getEventTemplate() {return PacpusEvent(GENERIC_EVENT);} // TODO check ??
 
 };
@@ -45 +65 @@
 {
     Q_OBJECT
+
 public:
     OutputInterfaceBase(QString name, ComponentBase * component, QObject * parent = 0):AbstractInterface(name,component,parent) {}
+
     virtual ~OutputInterfaceBase(){}
-
-    void addConnection(ConnectionBase connection) { _connection.append(connection);}
-    bool removeConnection(ConnectionBase connection) { return _connection.removeOne(connection);}
 
     QStringList getInputConnectedList() {
         QStringList list;
         for(QList<ConnectionBase>::iterator it = _connection.begin(); it!=_connection.end(); ++it)
-            list.append(it->getInputInterface()->getName());
+            list.append(it->getInterface()->getName());
         return list;
     }
 
-protected:
-    QList<ConnectionBase> _connection;
+    void send(/*const*/ QByteArray & data) {
+
+        // TODo getEvent
+        //PacpusEvent& event = _connection.at(0).getInterface()->
+        QDataStream in(&data,QIODevice::ReadOnly);
+        //in >> event;
+
+        //for(QList<ConnectionBase>::iterator it = _connection.begin(); it!=_connection.end(); ++it)
+        //        QApplication::postEvent(it->getInterface(),&event,it->getPriority());
+
+
+    }
 
 };
+
+static bool connectInterface(OutputInterfaceBase* out, InputInterfaceBase * in, int priority)
+{
+    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));
+        //LOG_INFO("connection : Output " << out->getSignature() << " => Input " << in->getSignature());
+        return true;
+    } else {
+   //LOG_WARN("connecting " << out->getSignature() << ":" << out->getDataType() << " to " << in->getSignature() << ":" << in->getDataType() << " failled : DataType incompatible " <<  QString(typeid(QByteArray).name()));
+   return false;
+    }
+}
 
 } // namespace pacpus

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

@@ -4 +4 @@
 #include <Pacpus/kernel/Log.h>
 #include <Pacpus/kernel/inputOutputBase.h>
-#include <Pacpus/kernel/PacpusEvent.h>
 
 #include <typeinfo>
@@ -41 +40 @@
     public:
 
+    PacpusEvent getEventTemplate() {return PacpusTypedEvent<T>(TYPED_EVENT); }
+
     void customEvent(QEvent* event) {
 
@@ -72 +73 @@
 
                 // from Connection interface to Component (G->T)
-            case GENERIC_EVENT2: {
+/*            case GENERIC_EVENT2: {
                 PacpusTypedEvent<QByteArray> * genericEvent = dynamic_cast<PacpusTypedEvent<QByteArray> *> (event);
-                qDebug() << "E2 ";
-                //if(sizeof(T) != genericEvent->_data.size())
-                //    qDebug() << "Incorrecte size " << sizeof(T) << " " << genericEvent->_data.size();
-              qDebug() << "t[18]= " << road_time();
                 T data;
                 QByteArray& buf = (QByteArray&) genericEvent->_data;
-                //qDebug() << "DataSize " <<buf.size();
                 QDataStream in(&buf,QIODevice::ReadOnly);
 
-                qDebug() << "t[19]= " << road_time();
-                //in >> data; // copy 7
-                qDebug() << "t[20]= " << road_time();
-
                 (dynamic_cast<C*>(_component)->*method)(data); // copy 8 X
-
-                qDebug() << "t[21]= " << road_time();
                 break;
             }
@@ -96 +86 @@
             case GENERIC_EVENT3: {
                 PacpusTypedEvent<T> * typedEvent = dynamic_cast<PacpusTypedEvent<T> *> (event);
-                qDebug() << "E3 ";
-              qDebug() << "t[6]= " << road_time();
                 (dynamic_cast<C*>(_component)->*method)(typedEvent->_data);     // copy 3 X
-              qDebug() << "t[7]= " << road_time();
+
                 break;
-            }
+            }*/
 
             default:
 
-            qDebug() << "Bad event ID " << event->type();
+            qDebug() << "Unknown event ID " << event->type();
                 break;
         }
@@ -128 +116 @@
         for(QList<ConnectionBase>::iterator it = _connection.begin(); it!=_connection.end(); ++it){
 
-            if(it->getInputInterface()->getDataType() != QString(typeid(QByteArray).name()))
-                QApplication::postEvent(it->getInputInterface(),new PacpusTypedEvent<T>(QEvent::Type(TYPED_EVENT),data),it->getPriority());
-           else {
-              qDebug() << "t[1]= " << road_time();
-                //QByteArray buf((char*)(&data),sizeof(T));
+            //if(it->getInterface()->getDataType() != QString(typeid(QByteArray).name()))
+                QApplication::postEvent(it->getInterface(),new PacpusTypedEvent<T>(TYPED_EVENT,data),it->getPriority());
+           /*else {
                 QByteArray buf;
                 QDataStream out(&buf,QIODevice::ReadWrite);
-              qDebug() << "t[2]= " << road_time();
-               // out << data;    // Copy 1
-              qDebug() << "t[3]= " << road_time();
-
-                PacpusTypedEvent<QByteArray> * ev =new PacpusTypedEvent<QByteArray>(QEvent::Type(GENERIC_EVENT3),buf);
-              qDebug() << "t[4]= " << road_time();
-                QApplication::postEvent(it->getInputInterface(),ev,it->getPriority()); // Copy 2 (ctor)
-              qDebug() << "t[5]= " << road_time();
-                //QApplication::postEvent(it->getInputInterface(),new PacpusTypedEvent<QByteArray>(QEvent::Type(GENERIC_EVENT3),buf),it->getPriority()); // Copy 2 (ctor)
-                }
-
-        //qDebug() << "send thread " << QThread::currentThread();
+                PacpusTypedEvent<QByteArray> * ev =new PacpusTypedEvent<QByteArray>(GENERIC_EVENT3,buf);
+                QApplication::postEvent(it->getInterface(),ev,it->getPriority()); // Copy 2 (ctor)
+                }*/
         }
     }
 
     // Used by Connection Interfaces only to pose generic event
-    void sendGenericData(char * data, size_t size) {
-              qDebug() << "t[15]= " << road_time();
+/*    void sendGenericData(char * data, size_t size) {
         QByteArray buf(data,size);  // copy 5
-              qDebug() << "t[16]= " << road_time();
         for(QList<ConnectionBase>::iterator it = _connection.begin(); it!=_connection.end(); ++it)
-            QApplication::postEvent(it->getInputInterface(),new PacpusTypedEvent<QByteArray>(QEvent::Type(GENERIC_EVENT2),buf),it->getPriority()); // Copy 6(ctor)
-              qDebug() << "t[17]= " << road_time();
-        //qDebug() << "send thread " << QThread::currentThread();
+            QApplication::postEvent(it->getInterface(),new PacpusTypedEvent<QByteArray>(GENERIC_EVENT2,buf),it->getPriority()); // Copy 6(ctor)
+
+
     }
-
+*/
     size_t getDataSize() {return sizeof(T);}
     QString getDataType() {return QString(typeid(T).name());}

branches/2.0-beta1/src/FileLib/CMakeLists.txt

@@ -42 +42 @@
 # Libraries
 # ========================================
+if(WIN32)        # TODO find other solution
 target_link_libraries(
     ${PROJECT_NAME}
         PacpusLib
 )
+endif()
 
 # ========================================

branches/2.0-beta1/src/PacpusLib/CMakeLists.txt

@@ -88 +88 @@
 )
 
+if(UNIX)
+set(LIBS
+    FileLib
+)
+endif()
+
 # ========================================
 # Libraries
@@ -95 +101 @@
     ${QT_LIBRARIES}
     ${PACPUS_DEPENDENCIES_LIB}
-    #FileLib
+    ${LIBS}
 )
 

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

@@ -196 +196 @@
         return false;}
 
-    OutputInterfaceBase * out = getComponent(output[0])->getOutput(output[1]);
-    InputInterfaceBase * in = getComponent(input[0])->getInput(input[1]);
-
-//    if(in->getDataType() == QString(typeid(QByteArray).name()) && out->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 and type argument
-        LOG_INFO("connection : Output " << out->getSignature() << " => Input " << in->getSignature())
-        return true;
-    } else {
-   LOG_WARN("connecting " << out->getSignature() << ":" << out->getDataType() << " to " << in->getSignature() << ":" << in->getDataType() << " failled : DataType incompatible " <<  QString(typeid(QByteArray).name()));
-   return false;
-    }
-
-    /*
-    FactoryMap::iterator it = factoryMap_.find(type);
-    if (it != factoryMap_.end())
-    {
-      (*it)->addComponent(name);
-      return true;
-    }
-    return false;*/
+    // NOTE Create communicationInterface if needed ??
+
+    return connectInterface(getComponent(output[0])->getOutput(output[1]), getComponent(input[0])->getInput(input[1]), priority);
+
 }
 

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

@@ -13 +13 @@
 
 
-//void OutputInterfaceBase::send2(QVariant val) {
-//    Q_EMIT sendOut(val);
-//}
+
+