Changeset 110 in pacpusframework for branches/2.0-beta1/include/Pacpus/kernel/inputOutputBase.h

Timestamp:

06/13/13 13:43:39 (11 years ago)

Author:

morasjul

Message:

Beta-2 : Fix CMakeList (link), remove useless code and add improvement

File:

• branches/2.0-beta1/include/Pacpus/kernel/inputOutputBase.h (modified) (4 diffs)

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

@@ -60 +60 @@
             //TODO get event Type anf call callback function
 
+            PacpusEvent * event = dynamic_cast<PacpusEvent *>(e);
     QByteArray buf;
     QDataStream out(&buf,QIODevice::WriteOnly);
-    out << e;
+    event->streamOut(out);
     // Callback QByteArray
     }
 
     void setReadingMode(ReadingMode mode) { readingMode_ = mode;}
-    virtual PacpusEvent getEventTemplate() {return PacpusEvent(GENERIC_EVENT);} // TODO check ??
+    virtual PacpusEvent* getEventTemplate() {return new PacpusEvent(GENERIC_EVENT);} // TODO check ??
 protected:
             ReadingMode readingMode_;
+private:
+        // metode(QByteArray)
+
+        //QQueue jobQueue_;
 };
 
@@ -89 +94 @@
 
     void send(/*const*/ QByteArray & data) {
+        // TODO check at least one Typed connection
 
-        // 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());
+        for(QList<ConnectionBase>::iterator it = _connection.begin(); it!=_connection.end(); ++it){
+                QDataStream in(&data,QIODevice::ReadOnly);
+                PacpusEvent* event = dynamic_cast<InputInterfaceBase*>(_connection.at(0).getInterface())->getEventTemplate();
+                event->streamIn(in);
+                QApplication::postEvent(it->getInterface(),event,it->getPriority());
+        }
 
 
@@ -103 +108 @@
 };
 
-static bool connectInterface(OutputInterfaceBase* out, InputInterfaceBase * in, int priority)
+static bool connectInterface(OutputInterfaceBase* out, InputInterfaceBase * in, int priority, InputInterfaceBase::ReadingMode mode = InputInterfaceBase::GetLast)
 {
     if(out->getDataType() == in->getDataType() || out->getDataType() == QString(typeid(QByteArray).name()) || in->getDataType() == QString(typeid(QByteArray).name())) {
@@ -110 +115 @@
         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());
-                in->setReadingMode(InputInterfaceBase::NeverSkip);
         return true;
     } else {