[openrtm-commit:00627] r510 - in trunk/OpenRTM-aist-Python: . OpenRTM_aist
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2012年 2月 2日 (木) 10:30:19 JST
Author: kurihara
Date: 2012-02-02 10:30:19 +0900 (Thu, 02 Feb 2012)
New Revision: 510
Modified:
trunk/OpenRTM-aist-Python/
trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/PeriodicExecutionContext.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/StringUtil.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py
trunk/OpenRTM-aist-Python/setup.py
Log:
r505-r509 merged.
Property changes on: trunk/OpenRTM-aist-Python
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/RELENG_1_0/OpenRTM-aist-Python:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python:396-478,495
+ /branches/RELENG_1_0/OpenRTM-aist-Python:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python:396-478,495
/branches/work/OpenRTM-aist-Python:505-509
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py 2012-01-23 07:12:25 UTC (rev 509)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py 2012-02-02 01:30:19 UTC (rev 510)
@@ -906,8 +906,10 @@
if comp.initialize() != RTC.RTC_OK:
self._rtcout.RTC_TRACE("RTC initialization failed: %s",
comp_id.getProperty("implementation_id"))
- comp.exit()
self._rtcout.RTC_TRACE("%s was finalized", comp_id.getProperty("implementation_id"))
+ if comp.exit() != RTC.RTC_OK:
+ self._rtcout.RTC_DEBUG("%s finalization was failed.",
+ comp_id.getProperty("implementation_id"))
return None
self._rtcout.RTC_TRACE("RTC initialization succeeded: %s",
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py 2012-01-23 07:12:25 UTC (rev 509)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py 2012-02-02 01:30:19 UTC (rev 510)
@@ -201,6 +201,7 @@
# Properties from arguments are marged finally
prop.mergeProperties(self._argprop)
+ prop.setProperty("config_file", self._configFile)
return prop
Property changes on: trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/RELENG_1_0/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py:345-395
/branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py:396-478,495
+ /branches/RELENG_1_0/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py:345-395
/branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py:396-478,495
/branches/work/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py:505-509
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/PeriodicExecutionContext.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/PeriodicExecutionContext.py 2012-01-23 07:12:25 UTC (rev 509)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/PeriodicExecutionContext.py 2012-02-02 01:30:19 UTC (rev 510)
@@ -773,7 +773,7 @@
compIn._sm._sm.goTo(RTC.INACTIVE_STATE)
count_ = 0
usec_per_sec_ = 1.0e6
- sleeptime_ = 10.0 * usec_per_sec_ / float(self.get_rate())
+ sleeptime_ = usec_per_sec_ / float(self.get_rate())
self._rtcout.RTC_PARANOID("Sleep time is %f [us]", sleeptime_)
while compIn._sm._sm.isIn(RTC.ACTIVE_STATE):
self._rtcout.RTC_TRACE("Waiting to be the INACTIVE state %d %f", (count_, float(time.time())))
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py 2012-01-23 07:12:25 UTC (rev 509)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py 2012-02-02 01:30:19 UTC (rev 510)
@@ -2600,6 +2600,77 @@
##
# @if jp
#
+ # @brief コンフィギュレーションサービスを取得する
+ #
+ # コンフィギュレーションサービスオブジェクトを取得する。このサービ
+ # スオブジェクトを利用して、コンフィギュレーションパラメータの操作
+ # を行うことができる。主な操作としては、
+ #
+ # - unbindParameter(): パラメータのアンバインド
+ # - update(): パラメータの更新
+ # - update(set_name): 特定のセットの更新
+ # - update(set_name, param_name): 特定のセットのパラメータの更新
+ # - isExist(): パラメータの存在確認
+ # - isChanged(): パラメータが変更されたかの確認
+ # - changedParameters(): 変更されたパラメータのリスト
+ # - getActiveId(): アクティブセット名の取得
+ # - haveConfig(config_id): コンフィグセットを持っているかどうか
+ # - getConfigurationSets(): 全コンフィギュレーションセットの取得
+ # - getConfigurationSet(set_id): 特定セットを取得
+ #
+ # コールバック関連
+ # - addConfigurationParamListener(): リスナの追加
+ # - removeConfigurationParamListener(): リスナの削除
+ # - addConfigurationSetListener(): リスナの追加
+ # - removeConfigurationSetListener(): リスナの削除
+ # - addConfigurationSetNameListener(): リスナの追加
+ # - removeConfigurationSetNameListener(): リスナの削除
+ #
+ # 詳細はConfigAdminクラスリファレンスを参照のこと。
+ #
+ # @return ConfigAdmin object
+ #
+ # @else
+ #
+ # @brief Getting configuration service
+ #
+ # This operation returns configuration service object. By using
+ # this service, user can manipulate configuration
+ # parameters. Mainly the following operations are supported.
+ #
+ # - unbindParameter(): Unbinding parameters
+ # - update(): Updateing parameters
+ # - update(set_name): Updating a specific configuration set
+ # - update(set_name, param_name): Updating specific parameter in a set
+ # - isExist(): Checking existence of a parameter
+ # - isChanged(): Check if a parameter was updated
+ # - changedParameters(): Getting changed parameter list
+ # - getActiveId(): Getting active configuration set name
+ # - haveConfig(config_id): Checking if having a specified configuration set
+ # - getConfigurationSets(): getting all the configuration sets
+ # - getConfigurationSet(set_id): Getting a configuration set
+ #
+ # Callback related member functions
+ # - addConfigurationParamListener(): Adding listener
+ # - removeConfigurationParamListener(): Removing listener
+ # - addConfigurationSetListener(): Adding listener
+ # - removeConfigurationSetListener(): Removing listener
+ # - addConfigurationSetNameListener(): Adding listener
+ # - removeConfigurationSetNameListener(): Removing listener
+ #
+ # See details in the ConfigAdmin class reference
+ #
+ # @return ConfigAdmin object
+ #
+ # @endif
+ #
+ # ConfigAdmin& getConfigService() { return m_configsets; }
+ def getConfigService(self):
+ return self._configsets
+
+ ##
+ # @if jp
+ #
# @brief コンフィギュレーションパラメータの更新(ID指定)
#
# 指定したIDのコンフィギュレーションセットに設定した値で、
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/StringUtil.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/StringUtil.py 2012-01-23 07:12:25 UTC (rev 509)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/StringUtil.py 2012-02-02 01:30:19 UTC (rev 510)
@@ -599,17 +599,28 @@
# 文字列リストが空の場合には空白文字を返す。
#
# @param sv CSV変換対象文字列リスト
+# @param delimiter 接続される文字列の間の文字 (デフォルト: ", ")
#
# @return CSV変換結果文字列
#
# @else
+# @brief Create CSV file from the given string list
#
+# Create CSV that arranged each element of the character string
+# list given by the argument.
+# If the string list is empty, the null will be returned.
+#
+# @param sv The target string list for creating CSV
+# @param delimiter Delimiter string between connected words (default: ",")
+#
+# @return String of CSV creating result
+#
# @endif
-def flatten(sv):
+def flatten(sv, delimiter=", "):
if len(sv) == 0:
return ""
- _str = ", ".join(sv)
+ _str = delimiter.join(sv)
return _str
Property changes on: trunk/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/RELENG_1_0/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py:345-395
/branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py:396-478,495
+ /branches/RELENG_1_0/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py:345-395
/branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py:396-478,495
/branches/work/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py:505-509
Property changes on: trunk/OpenRTM-aist-Python/setup.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/RELENG_1_0/OpenRTM-aist-Python/setup.py:345-395
/branches/RELENG_1_1/OpenRTM-aist-Python/setup.py:396-478,495
+ /branches/RELENG_1_0/OpenRTM-aist-Python/setup.py:345-395
/branches/RELENG_1_1/OpenRTM-aist-Python/setup.py:396-478,495
/branches/work/OpenRTM-aist-Python/setup.py:505-509
openrtm-commit メーリングリストの案内