Changeset 202 in pacpusframework

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

Files:

• examples/ProducerConsumerExample/ProducerExample.cpp (modified) (1 diff)
• include/Pacpus/kernel/ComponentBase.h (modified) (2 diffs)
• include/Pacpus/kernel/InputOutputInterface.h (modified) (2 diffs)
• src/PacpusLib/ComponentBase.cpp (modified) (3 diffs)
• src/PacpusLib/ComponentManager.cpp (modified) (2 diffs)

trunk/examples/ProducerConsumerExample/ProducerExample.cpp

@@ -94 +94 @@
             );
 
-        if (imageOutput && imageOutput->hasConnection()) {
-            imageOutput->send(mat);
-        }
+        checkedSend(imageOutput, mat);
 
         LOG_INFO("Sent data=" << counter << ", time=" << road_time());

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

trunk/src/PacpusLib/ComponentBase.cpp

@@ -13 +13 @@
 #include <boost/program_options/parsers.hpp>
 #include <boost/program_options/variables_map.hpp>
+#include <ostream>
 #include <string>
 #include <vector>
-
-const bool kPropertyVerboseDefaultValue = false;
 
 namespace po = boost::program_options;
@@ -23 +22 @@
 
 vector<string> convertAttributesToArgumentVector(const QDomNamedNodeMap & attributes);
-void logVariablesMap(po::variables_map vm);
+
+namespace std {
+
+template <typename _Elem, typename _Traits>
+std::basic_ostream<_Elem, _Traits> & operator<<(std::basic_ostream<_Elem, _Traits> & os, const boost::program_options::variables_map & vm)
+{
+    for (po::variables_map::const_iterator i = vm.cbegin(); i != vm.cend(); ++i) { 
+        const po::variable_value & v = i->second;
+        if (v.empty()) {
+            continue;
+        }
+        const type_info & type = v.value().type();
+        if (type == typeid(string)) {
+            const string & val = v.as<string>();
+            os << i->first << "=" << val;
+        } else if (type == typeid(long)) {
+            int val = v.as<long>();
+            os << i->first << "=" << val;
+        } else if (type == typeid(int)) {
+            int val = v.as<int>();
+            os << i->first << "=" << val;
+        } else if (type == typeid(unsigned long)) {
+            int val = v.as<unsigned long>();
+            os << i->first << "=" << val;
+        } else if (type == typeid(unsigned int)) {
+            int val = v.as<unsigned int>();
+            os << i->first << "=" << val;
+        } else if (type == typeid(double)) {
+            int val = v.as<double>();
+            os << i->first << "=" << val;
+        } else if (type == typeid(float)) {
+            int val = v.as<float>();
+            os << i->first << "=" << val;
+        } else if (type == typeid(bool)) {
+            int val = v.as<bool>();
+            os << i->first << "=" << val;
+        }
+    }
+    return os;
+}
+
+} // namespace std
 
 DECLARE_STATIC_LOGGER("pacpus.core.ComponentBase");
@@ -225 +265 @@
     }
 
-    logVariablesMap(vm);
-}
-
-void logVariablesMap(boost::program_options::variables_map vm)
-{
-    for (po::variables_map::iterator i = vm.begin(); i != vm.end(); ++i) { 
-        const po::variable_value& v = i->second;
-        if (v.empty()) {
-            continue;
-        }
-        const type_info & type = v.value().type();
-        if (type == typeid(string)) {
-            const string & val = v.as<string>();
-            LOG_INFO(i->first << "=" << val);
-        } else if (type == typeid(int)) {
-            int val = v.as<int>();
-            LOG_INFO(i->first << "=" << val);
-        } else if (type == typeid(bool)) {
-            int val = v.as<bool>();
-            LOG_INFO(i->first << "=" << val);
-        }
-    }
+    LOG_INFO(vm);
 }
 

trunk/src/PacpusLib/ComponentManager.cpp

@@ -17 +17 @@
 #include <QDomNodeList>
 #include <QObject>
+#include <QList>
+#include <ostream>
 
 using namespace pacpus;
+
+template <typename _Elem, typename _Traits, typename _ListElem>
+std::basic_ostream<_Elem, _Traits> & operator<<(std::basic_ostream<_Elem, _Traits> & os, const QList<_ListElem> & list)
+{
+    typedef QList<_ListElem> ListType;
+    for (ListType::const_iterator it = list.cbegin(), itend = list.cend(); it != itend; ++it) {
+        os << *it << "\n";
+    }
+    return os;
+}
 
 DECLARE_STATIC_LOGGER("pacpus.core.ComponentManager");
@@ -316 +328 @@
         }
          
-        // Pacpus 2.0 : add inputs and outputs
+        // add inputs and outputs
         component->addInputs();
         component->addOutputs();
+        // print inputs and outputs
+        LOG_INFO("Inputs: " << component->inputs().keys());
+        LOG_INFO("Outputs: " << component->outputs().keys());
 
         if (ComponentBase::CONFIGURATION_DELAYED == component->configurationState()) {