Changeset 199 in pacpusframework

Timestamp:

Oct 28, 2013, 2:28:14 PM (11 years ago)

Author:

Marek Kurdej

Message:

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

Location:

trunk

Files:

• include/Pacpus/kernel/ComponentBase.h (modified) (2 diffs)
• include/Pacpus/kernel/InputOutputBase.h (modified) (3 diffs)
• include/Pacpus/kernel/InputOutputInterface.h (modified) (6 diffs)
• src/PacpusLib/ComponentManager.cpp (modified) (2 diffs)

trunk/include/Pacpus/kernel/ComponentBase.h

@@ -57 +57 @@
 class OutputInterface;
 
+using ::boost::program_options::value;
+
 /** ComponentBase
  * @brief Base class of a Pacpus component.
@@ -139 +141 @@
     virtual void addOutputs() {}
 
-    boost::program_options::options_description_easy_init addParameters();
-
+    ::boost::program_options::options_description_easy_init addParameters();
+    
 protected:
     typedef QMap<QString, InputInterfaceBase *> InputsMap;

trunk/include/Pacpus/kernel/InputOutputBase.h

@@ -9 +9 @@
 #include <QApplication>
 #include <QList>
-#include <QString>
 #include <QStringList>
 #include <typeinfo>
@@ -29 +28 @@
     QString getSignature() const;
     QString getName() const;
-    virtual QString getDataType() = 0;
+    virtual std::size_t getDataSize() const = 0;
+    virtual const std::type_info & getDataType() const = 0;
     
     void addConnection(ConnectionBase connection);
@@ -72 +72 @@
     void setReadingMode(ReadingMode mode);
 
+    // FIXME: what's the purpose of this function?
     virtual PacpusEvent * getEventTemplate();
     

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

trunk/src/PacpusLib/ComponentManager.cpp

@@ -6 +6 @@
 /// @version    $Id: ComponentManager.cpp 76 2013-01-10 17:05:10Z kurdejma $
 
+#include <Pacpus/kernel/ComponentManager.h>
+
 #include <Pacpus/kernel/ComponentFactoryBase.h>
-#include <Pacpus/kernel/ComponentManager.h>
 #include <Pacpus/kernel/ComponentBase.h>
 #include <Pacpus/kernel/ConnectionBase.h>
 #include <Pacpus/kernel/InputOutputBase.h>
 #include <Pacpus/kernel/Log.h>
+
 #include <QDomNodeList>
 #include <QObject>
@@ -27 +29 @@
 bool connectInterface(OutputInterfaceBase * out, InputInterfaceBase * in, int priority, InputInterfaceBase::ReadingMode mode)
 {
-    if (out->getDataType() == in->getDataType() || out->getDataType() == QString(typeid(QByteArray).name()) || in->getDataType() == QString(typeid(QByteArray).name())) {
+    if ((out->getDataType() == in->getDataType())
+            || (out->getDataType() == typeid(QByteArray))
+            || (in->getDataType() == typeid(QByteArray))) {
         // Add connection
         out->addConnection(ConnectionBase(in, priority));  // TODO make connect function