Changeset 148 in pacpusframework for branches/2.0-beta1/include/Pacpus/kernel/PacpusEvent.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/PacpusEvent.h (modified) (4 diffs)

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

@@ -2 +2 @@
 #define PACPUS_EVENT_H
 
-#include <QEvent>
-#include "Pacpus/kernel/road_time.h"
+#include <algorithm>
+#include <Pacpus/kernel/road_time.h>
 #include <Pacpus/kernel/pacpus.h>
 #include <QDataStream>
+#include <QEvent>
 
 namespace pacpus {
@@ -11 +12 @@
 // registerEventType // TODO
 
-class GenericData {
-public:
-    GenericData(char* data, size_t size) {
-        data_ = (char*)malloc(size);
-        memcpy(data_,data,size);
-        _size = size;}
-
-    ~GenericData() {free(data_);}
-
-    char * data() { return data_;}
-    size_t size() {return _size;}
-
-private:
-char* data_;
-size_t _size;
-};
-
-enum PacpusEventType  {
+// FIXME: move to another header file
+enum PacpusEventType {
     TYPED_EVENT = 1000,
     GENERIC_EVENT = 2000,
@@ -44 +29 @@
     PacpusEvent(PacpusEventType type, road_time_t t = road_time(), road_timerange_t tr = 0)
         : QEvent(QEvent::Type(type))
-        , t_(t)
-        , tr_(tr)
+        , m_time(t)
+        , m_timerange(tr)
     {}
+
     virtual ~PacpusEvent()
     {}
 
-    // NOTE virtual pure ??
+    // TODO: should we make it virtual pure ???
     virtual QDataStream& streamOut(QDataStream& out)
     {
         return out;
-    } 
+    }
+
+    // TODO: should we make it virtual pure ???
     virtual QDataStream& streamIn(QDataStream& in)
     {
@@ -60 +48 @@
     }
 
-protected: // TODO make protected
-    road_time_t t_;
-    road_timerange_t tr_;
+    road_time_t & time()
+    {
+        return m_time;
+    }
+
+    const road_time_t & time() const
+    {
+        return m_time;
+    }
+
+    road_timerange_t & timerange()
+    {
+        return m_timerange;
+    }
+
+    const road_timerange_t & timerange() const
+    {
+        return m_timerange;
+    }
+protected:
+    road_time_t m_time;
+    road_timerange_t m_timerange;
+};
+
+template <typename T>
+class /*PACPUSLIB_API*/ TypedData
+{
+public:
+    TypedData(const T& data)
+    : m_data(data)
+    {
+    }
+
+    ~TypedData()
+    {
+    }
+
+    T & data()
+    {
+        return m_data;
+    }
+
+    const T & data() const
+    {
+        return m_data;
+    }
+
+    size_t size() const
+    {
+        return sizeof(T);
+    }
+
+private:
+    T m_data;
 };
 
 template<class T>
-class PacpusTypedEvent : public PacpusEvent
+class /*PACPUSLIB_API*/ PacpusTypedEvent
+    : public PacpusEvent
+    , public TypedData<T>
 {
 public:
-    PacpusTypedEvent(PacpusEventType type, T data = T(), road_time_t t = road_time(), road_timerange_t tr = 0 ):PacpusEvent(type, t, tr),data_(data) {}
-    ~PacpusTypedEvent() {}
+    // FIXME: why we need `data = T()` ???
+    PacpusTypedEvent(PacpusEventType type, const T & data = T(), road_time_t t = road_time(), road_timerange_t tr = 0 )
+        : PacpusEvent(type, t, tr)
+        , TypedData(data)
+    {}
 
-    QDataStream& streamOut(QDataStream& out) {return out << (quint64)t_ << tr_ /*<<data_*/;} // FIXME Stream Data errors
-    QDataStream& streamIn(QDataStream& in) {return in >> (quint64&)t_ >> tr_ /*>> data_*/;}
+    ~PacpusTypedEvent()
+    {}
 
-protected:
-    T data_;
+    QDataStream& streamOut(QDataStream& out)
+    {
+        // FIXME Stream Data errors
+        return out << (quint64) time() << timerange() /*<< m_data*/;
+    }
+
+    QDataStream& streamIn(QDataStream& in)
+    {
+        return in >> (quint64&) time() >> timerange() /*>> m_data*/;
+    }
 };
 
-class PACPUSLIB_API PacpusGenericEvent : public PacpusEvent
+class PACPUSLIB_API GenericData
 {
 public:
-    PacpusGenericEvent(PacpusEventType type, char* data, size_t size)
-        : PacpusEvent(type)
+    GenericData(const char* data, size_t size)
+        : m_data(NULL)
+        , m_dataSize(size)
     {
-        data_ = new char[size];
-        memcpy(data_,data,size);
-        _size = size;
+        m_data = new char[m_dataSize];
+        ::std::copy(data, data + m_dataSize, m_data);
+    }
 
+    ~GenericData()
+    {
+        delete[] m_data;
+    }
+
+    char * data()
+    {
+        return m_data;
     }
     
+    const char * data() const
+    {
+        return m_data;
+    }
+
+    size_t size() const
+    {
+        return m_dataSize;
+    }
+
+private:
+    char* m_data;
+    size_t m_dataSize;
+};
+
+class PACPUSLIB_API PacpusGenericEvent
+    : public PacpusEvent
+    , public GenericData
+{
+public:
+    PacpusGenericEvent(PacpusEventType type, const char* data, size_t size)
+        : PacpusEvent(type)
+        , GenericData(data, size)
+    {
+    }
+
     virtual ~PacpusGenericEvent()
     {
-        delete[] data_;
     }
-
-    char* data_;
-    size_t _size;
 };
-
 
 } // namespace pacpus
 
-inline QDataStream& operator << (QDataStream& out, pacpus::PacpusEvent& ev) {/*return ev.streamOut(out);*/ return out;}
-inline QDataStream& operator >> (QDataStream& in, pacpus::PacpusEvent& ev) {/*return ev.streamIn(in);*/ return in;}
+PACPUSLIB_API inline QDataStream& operator<< (QDataStream& out, pacpus::PacpusEvent& ev)
+{
+    /*return ev.streamOut(out);*/
+    return out;
+}
+
+PACPUSLIB_API inline QDataStream& operator>> (QDataStream& in, pacpus::PacpusEvent& ev)
+{
+    /*return ev.streamIn(in);*/
+    return in;
+}
 
 #endif // PACPUS_EVENT_H