Changeset 199 in pacpusframework for trunk/include/Pacpus/kernel/InputOutputInterface.h

Timestamp:

10/28/13 14:28:14 (11 years ago)

Author:

Marek Kurdej

Message:

Update: fixed getDataSize(), getDataType() in connections.

File:

• trunk/include/Pacpus/kernel/InputOutputInterface.h (modified) (6 diffs)

trunk/include/Pacpus/kernel/InputOutputInterface.h

@@ -2 +2 @@
 #define IN_OUT_INTERFACE_H
 
+#include <Pacpus/kernel/InputOutputBase.h>
 #include <Pacpus/kernel/Log.h>
-#include <Pacpus/kernel/InputOutputBase.h>
-#include <QApplication>
+
 #include <QByteArray>
-#include <QThread>
+//#include <QThread>
 #include <typeinfo>
 
@@ -16 +16 @@
 {
 public:
-    InputInterface(QString name, C * component, void (C::*m)(const T&))
+    typedef T data_type;
+    typedef C component_type;
+    typedef void (C::*process_data_function_type)(const T &);
+
+    InputInterface(QString name, C * component, process_data_function_type processMethod)
         : InputInterfaceBase(name, component, component)
-        , method(m)
+        , method(processMethod)
     {}
 
@@ -24 +28 @@
     {}
 
-    size_t getDataSize()
+    std::size_t getDataSize() const
     {
         return sizeof(T);
     }
 
-    QString getDataType()
+    const std::type_info & getDataType() const
     {
-        return QString(typeid(T).name());
+        return typeid(T);
     }
 
-    PacpusEvent* getEventTemplate()
+    // FIXME: what's the purpose of this function?
+    PacpusEvent * getEventTemplate()
     {
         return new PacpusTypedEvent<T>(TYPED_EVENT);
     }
 
+    // FIXME: what's the purpose of this function?
     void customEvent(QEvent * event)
     {
@@ -46 +52 @@
         case TYPED_EVENT:
             {
-
             PacpusTypedEvent<T> * typedEvent = dynamic_cast<PacpusTypedEvent<T> *> (event);
 
             LOG_DEBUG("Receiver " << getSignature() << " thread " << QThread::currentThread());
-
-
 
             if (typedEvent->timerange() < 500 && readingMode() == TimeBounded) {
@@ -104 +107 @@
 
 protected:
-    void (C::*method)(const T&);
+    process_data_function_type method;
 };
 
@@ -112 +115 @@
 {
 public:
+    typedef T data_type;
+    typedef C component_type;
+
     OutputInterface(QString name, C * component)
         : OutputInterfaceBase(name, component, component)
     {}
-    ~OutputInterface() {}
+
+    ~OutputInterface()
+    {}
 
     // Used by Components to send data througth typed output
     void send(const T & data, road_time_t t = road_time(), road_timerange_t tr = 0);
     
-    size_t getDataSize()
+    std::size_t getDataSize() const
     {
         return sizeof(T);
     }
 
-    QString getDataType()
+    const std::type_info & getDataType() const
     {
-        return QString(typeid(T).name());
+        return typeid(T);
     }
 };