[openrtm-commit:00208] r2192 - trunk/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2011-07-01 00:13:32 +0900 (Fri, 01 Jul 2011)
New Revision: 2192

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp
Log:
RTC's configuration parameter can be given from rtc.conf and 
-o option from command line arguments.


Modified: trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp	2011-06-29 05:01:29 UTC (rev 2191)
+++ trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp	2011-06-30 15:13:32 UTC (rev 2192)
@@ -1640,6 +1640,10 @@
 	    name_prop.load(conff);
 	  }
       }
+    if (m_config.findNode(category + "." + inst_name) != NULL)
+      {
+        name_prop << m_config.getNode(category + "." + inst_name);
+      }
     
     if (!m_config[type_conf].empty())
       {
@@ -1649,6 +1653,11 @@
 	    type_prop.load(conff);
 	  }
       }
+    if (m_config.findNode(category + "." + type_name) != NULL)
+      {
+        type_prop << m_config.getNode(category + "." + type_name);
+      }
+
     // Merge Properties. type_prop is merged properties
     comp->setProperties(prop);
     type_prop << name_prop;