[openrtm-commit:03080] r916 - trunk/OpenRTM-aist-Python/OpenRTM_aist

2018年 1月 19日 (金) 15:06:39 JST

Author: miyamoto
Date: 2018-01-19 15:06:39 +0900 (Fri, 19 Jan 2018)
New Revision: 916

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/CORBA_RTCUtil.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
Log:
[compat,bugfix,->RELENG_1_2] fixed bug.

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/CORBA_RTCUtil.py
===================================================================

--- trunk/OpenRTM-aist-Python/OpenRTM_aist/CORBA_RTCUtil.py	2018-01-17 00:43:18 UTC (rev 915)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/CORBA_RTCUtil.py	2018-01-19 06:06:39 UTC (rev 916)
@@ -242,7 +242,7 @@
 # @param rtc ÂÐ¾Ý¤ÎRT¥³¥ó¥Ý¡¼¥Í¥ó¥È
 # @param ec_id ¼Â¹Ô¥³¥ó¥Æ¥¥¹¥È¤ÎID
 # @return RTC¡¢EC¤Î¥ª¥Ö¥¸¥§¥¯¥È¥ê¥Õ¥¡¥ì¥ó¥¹¤¬nil¤Î¾ì¹ç¤ÏBAD_PARAMETER¤òÊÖ¤¹
-# nil¤Ç¤Ï¤Ê¤¤¾ì¹ç¤Ïdeactivate_component´Ø¿ô¤ÎÌá¤êÃÍ¤òÊÖ¤¹¡£RTC_OK¤Î¾ì¹ç¤Ï¥ê¥»¥Ã¥È¤¬À®¸ù
+# nil¤Ç¤Ï¤Ê¤¤¾ì¹ç¤Ïreset_component´Ø¿ô¤ÎÌá¤êÃÍ¤òÊÖ¤¹¡£RTC_OK¤Î¾ì¹ç¤Ï¥ê¥»¥Ã¥È¤¬À®¸ù
 #
 # @else
 #
@@ -267,29 +267,28 @@
 # @brief ÂÐ¾Ý¤ÎRT¥³¥ó¥Ý¡¼¥Í¥ó¥È¤Î»ØÄê¤·¤¿¼Â¹Ô¥³¥ó¥Æ¥¥¹¥È¤Ç¤Î¾õÂÖ¤ò¼èÆÀ
 #
 #
-# @param state RTC¤Î¾õÂÖ
 # @param rtc ÂÐ¾Ý¤ÎRT¥³¥ó¥Ý¡¼¥Í¥ó¥È
 # @param ec_id ¼Â¹Ô¥³¥ó¥Æ¥¥¹¥È¤ÎID
-# @return rtc¡¢ec¤¬nil¤Î¾ì¹ç¤ÏFalse¤òÊÖ¤¹¡£
-# nil¤Ç¤Ï¤Ê¤¤¾ì¹ç¤Ïstate[0]¤Ë¾õÂÖ¤òÂåÆþ¤·¤ÆTrue¤òÊÖ¤¹¡£
+# @return 1ÈÖÌÜ¤ÎÌá¤êÃÍ¤È¤·¤Ærtc¡¢ec¤¬nil¤Î¾ì¹ç¤ÏFalse¤òÊÖ¤·¡¢¤½¤ì°Ê³°¤Î¾ì¹ç¤ÏTrue¤òÊÖ¤¹¡£
+# 2ÈÖÌÜ¤ÎÌá¤êÃÍ¤È¤·¤Æ¾õÂÖ¤òÊÖ¤¹¡£
+# 
 #
 # @else
 #
 # @brief
-# @param state 
 # @param rtc
 # @param ec_id
 # @return 
 #
 # @endif
-def get_state(state, rtc, ec_id=0):
+def get_state(rtc, ec_id=0):
   if CORBA.is_nil(rtc):
     return False
   ec = get_actual_ec(rtc, ec_id)
   if CORBA.is_nil(ec):
-    return False
-  state[0] = ec.get_component_state(rtc)
-  return True
+    return False, RTC.CREATED_STATE
+  state = ec.get_component_state(rtc)
+  return True, state
 
 ##
 # @if jp
@@ -311,9 +310,9 @@
 #
 # @endif
 def is_in_inactive(rtc, ec_id=0):
-  state = [None]
-  if get_state(state, rtc, ec_id):
-    if state[0] == RTC.INACTIVE_STATE:
+  ret, state = get_state(rtc, ec_id)
+  if ret:
+    if state == RTC.INACTIVE_STATE:
       return True
   return False
 
@@ -337,8 +336,8 @@
 #
 # @endif
 def is_in_active(rtc, ec_id=0):
-  state = [None]
-  if get_state(state, rtc, ec_id):
+  ret, state = get_state(rtc, ec_id)
+  if ret:
     if state[0] == RTC.ACTIVE_STATE:
       return True
   return False
@@ -363,8 +362,8 @@
 #
 # @endif
 def is_in_error(rtc, ec_id=0):
-  state = [None]
-  if get_state(state,rtc, ec_id):
+  ret, state = get_state(rtc, ec_id)
+  if ret:
     if state[0] == RTC.ERROR_STATE:
       return True
   return False
@@ -439,11 +438,12 @@
 ##
 # @if jp
 #
-# @brief RTC¤Î»ØÄêID¤Î¼Â¹Ô¥³¥ó¥Æ¥¥¹¥È¤Î¼þ´ü¤ò¼èÆÀ
+# @brief RTC¤Î»ØÄêID¤Î¼Â¹Ô¥³¥ó¥Æ¥¥¹¥È¤Î¼þ´ü¤òÀßÄê
 #
 # 
 # @param rtc ÂÐ¾Ý¤ÎRT¥³¥ó¥Ý¡¼¥Í¥ó¥È
 # @param ec_id »ØÄê¤Î¼Â¹Ô¥³¥ó¥Æ¥¥¹¥È¤ÎID
+# @param rate ¼Â¹Ô¼þ´ü
 # @return set_rate´Ø¿ô¤ÎÌá¤êÃÍ¤òÊÖ¤¹¡£
 # RTC_OK¤ÇÀßÄê¤¬À®¸ù
 #
@@ -493,7 +493,7 @@
 # @param localcomp ÂÐ¾Ý¤ÎRT¥³¥ó¥Ý¡¼¥Í¥ó¥È
 # @param othercomp ¼Â¹Ô¥³¥ó¥Æ¥¥¹¥È¤È¤Î´ØÏ¢ÉÕ¤±¤ò²ò½ü¤¹¤ëRT¥³¥ó¥Ý¡¼¥Í¥ó¥È
 # @return ec¤Î¼èÆÀ¤Ë¼ºÇÔ¤·¤¿¾ì¹ç¤ÏBAD_PARAMETER¤òÊÖ¤¹
-# ¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤ÏremoveComponent´Ø¿ô¤ÎÌá¤êÃÍ¤òÊÖ¤¹¡£RTC_OK¤ÇÀÜÂ³À®¸ù¡£
+# ¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤ÏremoveComponent´Ø¿ô¤ÎÌá¤êÃÍ¤òÊÖ¤¹¡£RTC_OK¤Ç²ò½üÀ®¸ù¡£
 #
 # @else
 #
@@ -895,7 +895,7 @@
 # @param prop ÀßÄê
 # @param port0 ÂÐ¾Ý¤Î¥Ý¡¼¥È1
 # @param port1 ÂÐ¾Ý¤Î¥Ý¡¼¥È2
-# @return RTC¡¢EC¤Î¥ª¥Ö¥¸¥§¥¯¥È¥ê¥Õ¥¡¥ì¥ó¥¹¤¬nil¤Î¾ì¹ç¤ÏBAD_PARAMETER¤òÊÖ¤¹
+# @return ¥Ý¡¼¥È¤Î¥ª¥Ö¥¸¥§¥¯¥È¥ê¥Õ¥¡¥ì¥ó¥¹¤¬nil¤Î¾ì¹ç¤ÏBAD_PARAMETER¤òÊÖ¤¹
 # nil¤Ç¤Ï¤Ê¤¤¾ì¹ç¤Ïport0.connect´Ø¿ô¤ÎÌá¤êÃÍ¤òÊÖ¤¹¡£RTC_OK¤Î¾ì¹ç¤ÏÀÜÂ³¤¬À®¸ù
 #
 # @else
@@ -929,8 +929,8 @@
 # 
 # @param name ¥³¥Í¥¯¥¿Ì¾
 # @param prop ÀßÄê
-# @param port0 ÂÐ¾Ý¤Î¥Ý¡¼¥È
-# @param port1 ÂÐ¾Ý¤Î¥Ý¡¼¥È¤Î¥ê¥¹¥È
+# @param port ÂÐ¾Ý¤Î¥Ý¡¼¥È
+# @param target_ports ÂÐ¾Ý¤Î¥Ý¡¼¥È¤Î¥ê¥¹¥È
 # @return Á´¤Æ¤ÎÀÜÂ³¤¬À®¸ù¤·¤¿¾ì¹ç¤ÏRTC_OK¤òÊÖ¤¹¡£
 # connect´Ø¿ô¤¬RTC_OK°Ê³°¤òÊÖ¤·¤¿¾ì¹ç¤ÏBAD_PARAMETER¤òÊÖ¤¹¡£
 #
@@ -970,7 +970,7 @@
 #
 # @else
 # @class find_port
-# @brief ¥Ý¡¼¥È¤òÌ¾Á°¤«¤é¸¡º÷
+# @brief 
 #
 # @endif
 #
@@ -1135,7 +1135,7 @@
 # @endif
 def disconnect_by_portname_connector_name(port_name, conn_name):
   port_ref = get_port_by_url(port_name)
-  if port_ref == RTC.PortService._nil:
+  if CORBA.is_nil(port_ref):
     return RTC.BAD_PARAMETER
   
   conprof = port_ref.get_connector_profiles()
@@ -1177,7 +1177,7 @@
 # 
 # @param port_name ÂÐ¾Ý¤Î¥Ý¡¼¥ÈÌ¾
 # @param name ¥³¥Í¥¯¥¿ID
-# @return port¤¬nil¤Î¾ì¹ç¤ÏBAD_PARAMETER¤òÊÖ¤¹
+# @return port¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¤ÏBAD_PARAMETER¤òÊÖ¤¹
 # nil¤Ç¤Ï¤Ê¤¤¾ì¹ç¤Ïdisconnect´Ø¿ô¤ÎÌá¤êÃÍ¤òÊÖ¤¹¡£RTC_OK¤Î¾ì¹ç¤ÏÀÚÃÇ¤¬À®¸ù
 #
 # @else
@@ -1343,7 +1343,7 @@
 # @brief »ØÄê¤·¤¿¥³¥ó¥Õ¥£¥®¥å¥ì¡¼¥·¥ç¥ó¥»¥Ã¥ÈÌ¾¡¢¥Ñ¥é¥á¡¼¥¿Ì¾¤Î¥³¥ó¥Õ¥£¥®¥å¥ì¡¼¥·¥ç¥ó¥Ñ¥é¥á¡¼¥¿¤ò¼èÆÀ
 #
 # 
-# @param conf ¥³¥ó¥Õ¥£¥®¥å¥ì¡¼¥·¥ç¥ó
+# @param rtc RT¥³¥ó¥Ý¡¼¥Í¥ó¥È
 # @param confset_name ¥³¥ó¥Õ¥£¥®¥å¥ì¡¼¥·¥ç¥ó¥»¥Ã¥ÈÌ¾
 # @param value_name ¥Ñ¥é¥á¡¼¥¿Ì¾
 # @return ¥Ñ¥é¥á¡¼¥¿
@@ -1351,7 +1351,7 @@
 # @else
 #
 # @brief 
-# @param conf
+# @param rtc
 # @param confset_name
 # @param value_name
 # @param ret

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2018-01-17 00:43:18 UTC (rev 915)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2018-01-19 06:06:39 UTC (rev 916)
@@ -3095,13 +3095,20 @@
         self._rtcout.RTC_ERROR("Invalid format for pre-connection.")
         continue
       conn_prop[1] = conn_prop[1].replace(")","")
-      comp_ports = conn_prop[0].split(":")
+      comp_ports = conn_prop[0].split("^")
       if len(comp_ports) != 2:
         self._rtcout.RTC_ERROR("Invalid format for pre-connection.")
         self._rtcout.RTC_ERROR("Format must be Comp0.port0:Comp1.port1()")
         continue
       
-      comp0_name = comp_ports[0].split(".")[0]
+      tmp = comp_ports[0].split(".")
+      comp0_name = ""
+      for i in range(0,len(tmp)-1):
+        comp0_name = comp0_name + tmp[i]
+        if i != len(tmp)-2:
+          comp0_name = comp0_name + "."
+      
+      
       port0_name = comp_ports[0]
       
       if comp0_name.find("://") == -1:
@@ -3126,8 +3133,13 @@
       if CORBA.is_nil(port0_var):
         self._rtcout.RTC_DEBUG("port %s found: " % comp_ports[0])
         continue
-
-      comp1_name = comp_ports[1].split(".")[0]
+      
+      tmp = comp_ports[1].split(".")
+      comp1_name = ""
+      for i in range(0,len(tmp)-1):
+        comp1_name = comp1_name + tmp[i]
+        if i != len(tmp)-2:
+          comp1_name = comp1_name + "."
       port1_name = comp_ports[1]
       
       

