[openrtm-commit:01585] r2652 - trunk/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2015-07-23 09:10:33 +0900 (Thu, 23 Jul 2015)
New Revision: 2652

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/InPortBase.cpp
   trunk/OpenRTM-aist/src/lib/rtm/OutPortBase.cpp
Log:
[compat,->RELENG_1_1] Now properties given by rtc.conf are merged to PortProfile.properties.

Modified: trunk/OpenRTM-aist/src/lib/rtm/InPortBase.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/InPortBase.cpp	2015-07-22 08:20:39 UTC (rev 2651)
+++ trunk/OpenRTM-aist/src/lib/rtm/InPortBase.cpp	2015-07-23 00:10:33 UTC (rev 2652)
@@ -96,7 +96,17 @@
   void InPortBase::init(coil::Properties& prop)
   {
     RTC_TRACE(("init()"));
+    RTC_PARANOID(("given properties:"));
+    RTC_DEBUG_STR((prop));
+
+    // merge properties to PortProfile.properties
     m_properties << prop;
+    NVList nv;
+    NVUtil::copyFromProperties(nv, m_properties);
+    CORBA_SeqUtil::push_back_list(m_profile.properties, nv);
+    RTC_PARANOID(("updated properties:"));
+    RTC_DEBUG_STR((m_properties));
+
     if (m_singlebuffer)
       {
         RTC_DEBUG(("single buffer mode."));

Modified: trunk/OpenRTM-aist/src/lib/rtm/OutPortBase.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/OutPortBase.cpp	2015-07-22 08:20:39 UTC (rev 2651)
+++ trunk/OpenRTM-aist/src/lib/rtm/OutPortBase.cpp	2015-07-23 00:10:33 UTC (rev 2652)
@@ -128,8 +128,11 @@
     RTC_PARANOID(("given properties:"));
     RTC_DEBUG_STR((prop));
 
+    // merge properties to PortProfile.properties
     m_properties << prop;
-
+    NVList nv;
+    NVUtil::copyFromProperties(nv, m_properties);
+    CORBA_SeqUtil::push_back_list(m_profile.properties, nv);
     RTC_PARANOID(("updated properties:"));
     RTC_DEBUG_STR((m_properties));