Changeset 96 in pacpusframework for branches/2.0-beta1/include/Pacpus/kernel/inputOutputInterface.h

Timestamp:

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

Author:

morasjul

Message:

2.0 minor fixs

File:

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

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());}