Changeset 148 in pacpusframework for branches/2.0-beta1/include/Pacpus/kernel/InputOutputInterface.h

Timestamp:

07/31/13 14:42:05 (11 years ago)

Author:

Marek Kurdej

Message:

Corrections in PacpusEvent, InputOutputBase, InputOutputInterface.
Fixed: DLL import/export in geodesie.h.

File:

• branches/2.0-beta1/include/Pacpus/kernel/InputOutputInterface.h (modified) (6 diffs)

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

@@ -21 +21 @@
 
 template <class T, class C>
-class InputInterface : public InputInterfaceBase
+class InputInterface
+    : public InputInterfaceBase
 {
 public:
-    InputInterface(QString name, C * component, void (C::*m)(const T&)):InputInterfaceBase(name,component,component), method(m) {}
-    ~InputInterface() {}
-    size_t getDataSize() {return sizeof(T);}
-    QString getDataType() {return QString(typeid(T).name());}
+    InputInterface(QString name, C * component, void (C::*m)(const T&))
+        : InputInterfaceBase(name,component,component)
+        , method(m)
+    {}
 
-protected:
+    ~InputInterface()
+    {}
 
-public:
+    size_t getDataSize()
+    {
+        return sizeof(T);
+    }
 
-    PacpusEvent* getEventTemplate() {return new PacpusTypedEvent<T>(TYPED_EVENT); }
+    QString getDataType()
+    {
+        return QString(typeid(T).name());
+    }
 
-    void customEvent(QEvent* event) {
-// TODO check compoennt state started
+    PacpusEvent* getEventTemplate()
+    {
+        return new PacpusTypedEvent<T>(TYPED_EVENT);
+    }
+
+    void customEvent(QEvent* event)
+    {
+        // TODO check component state started
         switch (event->type()) {
-
-        // from Component to Component (T->T)
-        case TYPED_EVENT: {
+        case TYPED_EVENT:
+            {
+            // cast from Component to Component (T->T)
             PacpusTypedEvent<T> * typedEvent = dynamic_cast<PacpusTypedEvent<T> *> (event);
 
@@ -47 +61 @@
             //if(_component) get state
 
-            if(typedEvent->tr_ < 500 && readingMode_ == TimeBounded) {
+            if (typedEvent->timerange() < 500 && readingMode() == TimeBounded) {
                 //LOG_WARN("Incorrect TimeRange (0), switch to NeverSkip");
                 qDebug() << "Incorrect TimeRange (0), switch to NeverSkip";
-                readingMode_ = NeverSkip;}
+                readingMode() = NeverSkip;}
 
-            switch (readingMode_){
+            switch (readingMode()) {
             case TimeBounded:
                 //qDebug() << "Input " << this->getSignature().leftJustified(20) << QString("Time bournded").leftJustified(15) << road_time()- typedEvent->t_ << "\t" << typedEvent->tr_;
 
-                if(road_time() - typedEvent->t_> typedEvent->tr_)
-                    {qDebug() << "Data skip " << this->getSignature();  break;}
+                if (road_time() - typedEvent->time() > typedEvent->timerange()) {
+                    qDebug() << "Data skip " << this->getSignature();
+                    break;
+                }
 
-                (dynamic_cast<C*>(_component)->*method)(typedEvent->data_);
+                (dynamic_cast<C*>(component())->*method)(typedEvent->data());
                 break;
 
@@ -65 +81 @@
                 //qDebug() << "Input " << this->getSignature().leftJustified(20) << QString("GetLast").leftJustified(15) << road_time() - typedEvent->t_ << "\t" << typedEvent->tr_;
 
-                (dynamic_cast<C*>(_component)->*method)(typedEvent->data_);
+                (dynamic_cast<C*>(component())->*method)(typedEvent->data());
                 QCoreApplication::removePostedEvents(this,TYPED_EVENT); // delete all remining events
                 break;
@@ -73 +89 @@
 
             default:
-                (dynamic_cast<C*>(_component)->*method)(typedEvent->data_);
+                (dynamic_cast<C*>(component())->*method)(typedEvent->data());
             }
             break;
@@ -136 +152 @@
         //QSharedPointer<T> sharedPointer = new T(data);
 
-        for(QList<ConnectionBase>::iterator it = _connection.begin(); it!=_connection.end(); ++it){
+        for(QList<ConnectionBase>::iterator it = connections().begin(); it != connections().end(); ++it){
             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 << " ";
@@ -166 +182 @@
     }
 */
-    size_t getDataSize() {return sizeof(T);}
-    QString getDataType() {return QString(typeid(T).name());}
+    size_t getDataSize()
+    {
+        return sizeof(T);
+    }
+
+    QString getDataType()
+    {
+        return QString(typeid(T).name());
+    }
 };