Changeset 102 in pacpusframework for branches/2.0-beta1/include/Pacpus

Timestamp:

Jun 3, 2013, 6:13:21 PM (11 years ago)

Author:

morasjul

Message:

beta : correct reading mode

Location:

branches/2.0-beta1/include/Pacpus/kernel

Files:

• ConnectionBase.h (modified) (2 diffs)
• inputOutputBase.h (modified) (3 diffs)
• inputOutputInterface.h (modified) (3 diffs)

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

@@ -2 +2 @@
 #define ConnectionBase_H
 
+#include <Pacpus/kernel/pacpus.h>
 
 namespace pacpus {
@@ -7 +8 @@
 class AbstractInterface;
 
-class ConnectionBase
+class PACPUSLIB_API ConnectionBase
 {
 public:

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

@@ -47 +47 @@
     //InputInterfaceBase(QString name, ComponentBase * component,int a, QObject * parent = 0):AbstractInterface(name,component,parent) {} // TODO add ctor with function pointer
 
+            enum ReadingMode {
+        NeverSkip,
+        TimeBounded,
+        GetLast
+    };
+
     virtual ~InputInterfaceBase(){}
 
@@ -60 +66 @@
     }
 
+    void setReadingMode(ReadingMode mode) { readingMode_ = mode;}
     virtual PacpusEvent getEventTemplate() {return PacpusEvent(GENERIC_EVENT);} // TODO check ??
-
+protected:
+            ReadingMode readingMode_;
 };
 
@@ -103 +111 @@
         in->addConnection(ConnectionBase(out,priority));
         //LOG_INFO("connection : Output " << out->getSignature() << " => Input " << in->getSignature());
+                in->setReadingMode(InputInterfaceBase::NeverSkip);
         return true;
     } else {

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

@@ -23 +23 @@
     InputInterface(QString name, C * component, void (C::*m)(const T&)):InputInterfaceBase(name,component,component), method(m) {}
     ~InputInterface() {}
-
-    enum ReadingMode {
-        NeverSkip,
-        TimeBounded,
-        GetLast
-    };
-
-    void setReadingMode(ReadingMode mode) { readingMode_ = mode;}
     size_t getDataSize() {return sizeof(T);}
     QString getDataType() {return QString(typeid(T).name());}
 
     protected:
-    ReadingMode readingMode_;
     int boundingTime_;
 
@@ -57 +48 @@
                 switch (readingMode_){
                     case TimeBounded:
+                                                qDebug() << "Input " << this->getSignature() << " Time bournded "<< road_time()- typedEvent->t_ << " " << typedEvent->tr_;
                     if(road_time() - typedEvent->t_> typedEvent->tr_)
-                        break;
+                                                { qDebug() << "Data skip " << this->getSignature();
+                                        break;}
                         (dynamic_cast<C*>(_component)->*method)(typedEvent->_data);
                         break;
                     case GetLast:
+                                                qDebug() << "Input " << this->getSignature() << "GetLast "<< road_time() - typedEvent->t_ << " " << typedEvent->tr_;
                         (dynamic_cast<C*>(_component)->*method)(typedEvent->_data);
                         QCoreApplication::removePostedEvents(this,TYPED_EVENT); // delete all remining events
                         break;
                     case NeverSkip:
+                                                qDebug() << "Input " << this->getSignature() << "NeverSkip "<< road_time() - typedEvent->t_ << " " << typedEvent->tr_;
                     default:
                         (dynamic_cast<C*>(_component)->*method)(typedEvent->_data);
@@ -113 +108 @@
 
     // Used by Components to send data througth typed output
-    void send(const T & data) {
+    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),it->getPriority());
+                QApplication::postEvent(it->getInterface(),new PacpusTypedEvent<T>(TYPED_EVENT,data,t,tr),it->getPriority());
            /*else {
                 QByteArray buf;