Changeset 202 in pacpusframework for trunk/include/Pacpus

Timestamp:

Oct 29, 2013, 3:40:48 PM (11 years ago)

Author:

Marek Kurdej

Message:

Added: OutputInterface::checkedSend.
Added: ComponentManager: prints InputsMap, OutputsMap.

Location:

trunk/include/Pacpus/kernel

Files:

• ComponentBase.h (modified) (2 diffs)
• InputOutputInterface.h (modified) (2 diffs)

trunk/include/Pacpus/kernel/ComponentBase.h

@@ -101 +101 @@
     QString getName() const;
 
-    /// @todo DOC
-    InputInterfaceBase * getInput(QString name) const;
-
-    /// @todo DOC
-    OutputInterfaceBase * getOutput(QString name) const;
-
 protected:
     /// Changes the state of the component.
@@ -155 +149 @@
         outputs().insert(name, connection);
     }
+    
+    /// @todo DOC
+    InputInterfaceBase * getInput(QString name) const;
+
+    /// @todo DOC
+    OutputInterfaceBase * getOutput(QString name) const;
 
     template <typename DataType, class ComponentType>

trunk/include/Pacpus/kernel/InputOutputInterface.h

@@ -5 +5 @@
 #include <Pacpus/kernel/Log.h>
 
-#include <QApplication>
 #include <QByteArray>
 #include <QCoreApplication>
@@ -147 +146 @@
 
     for (QList<ConnectionBase>::iterator it = connections().begin(), itend = connections().end(); it != itend; ++it) {
-        // Event is deleted by the event loop handler
-        QApplication::postEvent(it->getInterface(), new PacpusTypedEvent<T>(TYPED_EVENT,data,t,tr),it->getPriority());
-        //qDebug() << "sender " << it->getInterface()->getSignature() << " Data & " << &data << " ";
+        // Qt documentatino:
+        //  The event must be allocated on the heap since the post event queue will take ownership of the event and delete it once it has been posted.
+        //  It is not safe to access the event after it has been posted.    
+        QEvent * newEvent = new PacpusTypedEvent<T>(TYPED_EVENT, data, t, tr);
+        QCoreApplication::postEvent(it->getInterface(), newEvent, it->getPriority());
+        LOG_DEBUG("Sender: " << it->getInterface()->getSignature());
+        LOG_DEBUG("Data &: " << &data);
     }
+}
+
+template <typename T1, typename T2, class C>
+bool checkedSend(OutputInterface<T1, C> * sender, const T2 & data, road_time_t t = road_time(), road_timerange_t tr = 0);
+
+template <typename T1, typename T2, class C>
+bool checkedSend(OutputInterface<T1, C> * sender, const T2 & data, road_time_t t, road_timerange_t tr)
+{
+    if (sender && sender->hasConnection()) {
+        sender->send(data, t, tr);
+        return true;
+    }
+    return false;
 }