[openrtm-commit:00767] r528 - branches/work/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: kurihara
Date: 2012-03-13 16:58:55 +0900 (Tue, 13 Mar 2012)
New Revision: 528

Modified:
   branches/work/OpenRTM-aist-Python/OpenRTM_aist/DefaultConfiguration.py
   branches/work/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
Log:
[compat,impl,newfunc] Default and inherited configurations have been updated for new EC. 
                      Now non-empty properties are only inherited. refs #2339

Modified: branches/work/OpenRTM-aist-Python/OpenRTM_aist/DefaultConfiguration.py
===================================================================
--- branches/work/OpenRTM-aist-Python/OpenRTM_aist/DefaultConfiguration.py	2012-03-13 07:43:23 UTC (rev 527)
+++ branches/work/OpenRTM-aist-Python/OpenRTM_aist/DefaultConfiguration.py	2012-03-13 07:58:55 UTC (rev 528)
@@ -64,7 +64,8 @@
                  "corba.nameservice.replace_endpoint", "NO",
                  "exec_cxt.periodic.type",           "PeriodicExecutionContext",
                  "exec_cxt.periodic.rate",           "1000",
-                 "exec_cxt.evdriven.type",           "EventDrivenExecutionContext",
+                 "exec_cxt.sync_transition",         "YES",
+                 "exec_cxt.transition_timeout",      "0.5",
                  "manager.modules.load_path",        "./",
                  "manager.modules.abs_path_allowed", "YES",
                  "manager.is_master",                "NO",

Modified: branches/work/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
===================================================================
--- branches/work/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2012-03-13 07:43:23 UTC (rev 527)
+++ branches/work/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2012-03-13 07:58:55 UTC (rev 528)
@@ -862,7 +862,15 @@
                     "corba.id",
                     "exec_cxt.periodic.type",
                     "exec_cxt.periodic.rate",
-                    "exec_cxt.evdriven.type",
+                    "exec_cxt.event_driven.type",
+                    "exec_cxt.sync_transition",
+                    "exec_cxt.sync_activation",
+                    "exec_cxt.sync_deactivation",
+                    "exec_cxt.sync_reset",
+                    "exec_cxt.transition_timeout",
+                    "exec_cxt.activation_timeout",
+                    "exec_cxt.deactivation_timeout",
+                    "exec_cxt.reset_timeout",
                     "logger.enable",
                     "logger.log_level",
                     "naming.enable",
@@ -870,7 +878,8 @@
                     "naming.formats"]
 
     for i in range(len(inherit_prop)):
-      prop.setProperty(inherit_prop[i],self._config.getProperty(inherit_prop[i]))
+      if self._config.findNode(inherit_prop[i]):
+        prop.setProperty(inherit_prop[i],self._config.getProperty(inherit_prop[i]))
 
     comp = factory.create(self)
 
@@ -1879,7 +1888,6 @@
   # bool Manager::initLocalService()
   def initLocalService(self):
     self._rtcout.RTC_TRACE("Manager::initLocalService()")
-
     admin_ = OpenRTM_aist.LocalServiceAdmin.instance()
     prop_ = OpenRTM_aist.Properties(prop=self._config.getNode("manager.local_service"))
     admin_.init(prop_)