Changeset 202 in pacpusframework for trunk/src

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/src/PacpusLib

Files:

• ComponentBase.cpp (modified) (3 diffs)
• ComponentManager.cpp (modified) (2 diffs)

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()) {