Changeset 159 in pacpusframework

Timestamp:

Aug 1, 2013, 2:19:48 PM (11 years ago)

Author:

morasjul

Message:

Somme cleaning in InputOutputInterface.h and InputOutputBase.h

Location:

branches/2.0-beta1/include/Pacpus/kernel

Files:

• InputOutputBase.h (modified) (2 diffs)
• InputOutputInterface.h (modified) (8 diffs)

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

@@ -117 +117 @@
     {}
 
+    // TODO for serealization prupose (not yet implemented !!!)
     virtual void customEvent(QEvent* e)
     {
@@ -179 +180 @@
     }
 
+    // TODO for serealization prupose (not yet implemented !!!)
     void send(/*const*/ QByteArray & data)
     {

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

@@ -42 +42 @@
     {
         // TODO check component state started
+        //if(_component) get state
         switch (event->type()) {
         case TYPED_EVENT:
             {
-            // cast from Component to Component (T->T)
+
             PacpusTypedEvent<T> * typedEvent = dynamic_cast<PacpusTypedEvent<T> *> (event);
 
-            LOG_DEBUG("Receiver " << getSignature() << " thread " << QThread::currentThread() << " Data & " << & typedEvent->data_);
+            LOG_DEBUG("Receiver " << getSignature() << " thread " << QThread::currentThread());
 
-            //if(_component) get state
+
 
             if (typedEvent->timerange() < 500 && readingMode() == TimeBounded) {
@@ -59 +60 @@
             switch (readingMode()) {
             case TimeBounded:
-                LOG_DEBUG("Input " << this->getSignature().leftJustified(20) << QString("Time bournded").leftJustified(15) << road_time()- typedEvent->t_ << "\t" << typedEvent->tr_);
 
                 if (road_time() - typedEvent->time() > typedEvent->timerange()) {
@@ -70 +70 @@
 
             case GetLast:
-                LOG_DEBUG("Input " << this->getSignature().leftJustified(20) << QString("GetLast").leftJustified(15) << road_time() - typedEvent->t_ << "\t" << typedEvent->tr_);
 
                 (dynamic_cast<C*>(component())->*method)(typedEvent->data());
@@ -78 +77 @@
 
             case NeverSkip:
-                LOG_DEBUG("Input " << this->getSignature().leftJustified(20) << QString("NeverSkip").leftJustified(15) << road_time() - typedEvent->t_ << "\t" << typedEvent->tr_);
+                (dynamic_cast<C*>(component())->*method)(typedEvent->data());
+                break;
 
             default:
-                (dynamic_cast<C*>(component())->*method)(typedEvent->data());
+                LOG_WARN("Unknown reading mode " << readingMode());
             }
             break;
         }
 
-            // from Connection interface to Component (G->T)
-            /*            case GENERIC_EVENT2: {
-                PacpusTypedEvent<QByteArray> * genericEvent = dynamic_cast<PacpusTypedEvent<QByteArray> *> (event);
-                T data;
-                QByteArray& buf = (QByteArray&) genericEvent->data_;
-                QDataStream in(&buf,QIODevice::ReadOnly);
-
-                (dynamic_cast<C*>(_component)->*method)(data); // copy 8 X
-                break;
-            }
-
-                // from Component to Connection interface (T->G) (Typed in QByteArray)
-            case GENERIC_EVENT3: {
-                PacpusTypedEvent<T> * typedEvent = dynamic_cast<PacpusTypedEvent<T> *> (event);
-                (dynamic_cast<C*>(_component)->*method)(typedEvent->data_);     // copy 3 X
-
-                break;
-            }*/
+            // Add here new event type if needed
 
         default:
@@ -112 +95 @@
     }
 
+    // TODO for Pulling mode (not yet implemented !!!)
     T& getData() {
         T data;
         // TODO ask output data;
-
-            //LOG4CXX_INFO(getLogger(), "Hello, World");
 
         return data;
@@ -123 +105 @@
 protected:
     void (C::*method)(const T&);
-
- /*   log4cxx::LoggerPtr& getLogger() {
-        static log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger(    LOG4CXX_LOCATION.getClassName()));
-        return logger;
-    }*/
 
 };
@@ -141 +118 @@
     void send(const T & data, road_time_t t = road_time(), road_timerange_t tr = 0)
     {
+        // FIXME Data Shared
         //QSharedPointer<T> sharedPointer = new T(data);
 
@@ -146 +124 @@
             QApplication::postEvent(it->getInterface(),new PacpusTypedEvent<T>(TYPED_EVENT,data,t,tr),it->getPriority()); // Event is delete by the event loop handler
             //qDebug() << "sender " << it->getInterface()->getSignature() <<  " thread " << QThread::currentThread() << " Data & " << &data << " ";
-            // TODO Data Shared
         }
     }
 
-    /*    void send(const T & data, road_time_t t = road_time(), road_timerange_t tr = 0) {
-        for(QList<ConnectionBase>::iterator it = _connection.begin(); it!=_connection.end(); ++it){
-
-            if(it->getInterface()->getDataType() != QString(typeid(QByteArray).name()))
-                QApplication::postEvent(it->getInterface(),new PacpusTypedEvent<T>(TYPED_EVENT,data,t,tr),it->getPriority());
-           else {
-                QByteArray buf;
-                QDataStream out(&buf,QIODevice::ReadWrite);
-                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) {
-        QByteArray buf(data,size);  // copy 5
-        for(QList<ConnectionBase>::iterator it = _connection.begin(); it!=_connection.end(); ++it)
-            QApplication::postEvent(it->getInterface(),new PacpusTypedEvent<QByteArray>(GENERIC_EVENT2,buf),it->getPriority()); // Copy 6(ctor)
-
-
-    }
-*/
     size_t getDataSize()
     {