[openrtm-commit:00269] r421 - branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: kurihara
Date: 2011-07-27 22:21:22 +0900 (Wed, 27 Jul 2011)
New Revision: 421

Modified:
   branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
   branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py
Log:
Now inherited property values includes the following values.
- config.version
- openrtm.name
- openrtm.version
- os.name
- os.release
- os.version
- os.arch
- os.hostname
- corba.endpoint
- corba.id
- exec_cxt.periodic.type
- exec_cxt.periodic.rate
- exec_cxt.evdriven.type

Now component's properties (m_properties) are imported to 
ComponentProfile::properties. refs #2126

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2011-07-27 12:44:32 UTC (rev 420)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2011-07-27 13:21:22 UTC (rev 421)
@@ -827,7 +827,17 @@
     # get default configuration of component.
     prop = factory.profile()
 
-    inherit_prop = ["exec_cxt.periodic.type",
+    inherit_prop = ["config.version",
+                    "openrtm.name",
+                    "openrtm.version",
+                    "os.name",
+                    "os.release",
+                    "os.version",
+                    "os.arch",
+                    "os.hostname",
+                    "corba.endpoint",
+                    "corba.id",
+                    "exec_cxt.periodic.type",
                     "exec_cxt.periodic.rate",
                     "exec_cxt.evdriven.type",
                     "logger.enable",

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py	2011-07-27 12:44:32 UTC (rev 420)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py	2011-07-27 13:21:22 UTC (rev 421)
@@ -897,15 +897,17 @@
   def get_component_profile(self):
     self._rtcout.RTC_TRACE("get_component_profile()")
     try:
-      return RTC.ComponentProfile(self._properties.getProperty("instance_name"),
-                                  self._properties.getProperty("type_name"),
-                                  self._properties.getProperty("description"),
-                                  self._properties.getProperty("version"),
-                                  self._properties.getProperty("vendor"),
-                                  self._properties.getProperty("category"),
-                                  self._portAdmin.getPortProfileList(),
-                                  self._profile.parent,
-                                  self._profile.properties)
+      prop_ = RTC.ComponentProfile(self._properties.getProperty("instance_name"),
+                                   self._properties.getProperty("type_name"),
+                                   self._properties.getProperty("description"),
+                                   self._properties.getProperty("version"),
+                                   self._properties.getProperty("vendor"),
+                                   self._properties.getProperty("category"),
+                                   self._portAdmin.getPortProfileList(),
+                                   self._profile.parent,
+                                   self._profile.properties) 
+      OpenRTM_aist.NVUtil.copyFromProperties(self._profile.properties, self._properties)
+      return prop_
       # return RTC.ComponentProfile(self._profile.instance_name,
       #               self._profile.type_name,
       #               self._profile.description,