[openrtm-commit:03022] r901 - in trunk/OpenRTM-aist-Python/OpenRTM_aist: . examples/Throughput

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-12-15 11:03:34 +0900 (Fri, 15 Dec 2017)
New Revision: 901

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/examples/Throughput/rtc.conf
Log:
[compat, bugfix, ->RELENG_1_2] bug fix.

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2017-12-13 00:32:40 UTC (rev 900)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2017-12-15 02:03:34 UTC (rev 901)
@@ -3070,7 +3070,7 @@
   # @if jp
   # @brief µ¯Æ°»þ¤Ërtc.conf¤Ç»ØÄꤷ¤¿¥Ý¡¼¥È¤òÀܳ¤¹¤ë
   # Îã:
-  # manager.components.preconnect: RTC0.port0^RTC0.port1(interface_type=corba_cdr&dataflow_type=pull&~),~
+  # manager.components.preconnect: RTC0.port0:RTC0.port1(interface_type=corba_cdr&dataflow_type=pull&~),~
   # @param self
   # @else
   #
@@ -3094,10 +3094,10 @@
         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()")
+        self._rtcout.RTC_ERROR("Format must be Comp0.port0:Comp1.port1()")
         continue
       
       comp0_name = comp_ports[0].split(".")[0]
@@ -3159,6 +3159,14 @@
       for o in opt_props:
         temp = o.split("=")
         if len(temp) == 2:
+          s = [temp[0]]
+          OpenRTM_aist.eraseHeadBlank(s)
+          OpenRTM_aist.eraseTailBlank(s)
+          temp[0] = s[0]
+          s = [temp[1]]
+          OpenRTM_aist.eraseHeadBlank(s)
+          OpenRTM_aist.eraseTailBlank(s)
+          temp[1] = s[0]
           prop.setProperty("dataport."+temp[0],temp[1])
       
       if RTC.RTC_OK != OpenRTM_aist.CORBA_RTCUtil.connect(c, prop, port0_var, port1_var):

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/examples/Throughput/rtc.conf
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/examples/Throughput/rtc.conf	2017-12-13 00:32:40 UTC (rev 900)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/examples/Throughput/rtc.conf	2017-12-15 02:03:34 UTC (rev 901)
@@ -1,5 +1,5 @@
 corba.args: -ORBgiopMaxMsgSize 209715200
-manager.components.preconnect: Throughput_py0.out^Throughput_py0.in(dataflow_type=push&interface_type=corba_cdr)
+manager.components.preconnect: Throughput_py0.out:Throughput_py0.in(dataflow_type=push&interface_type=corba_cdr)
 manager.components.preactivation: Throughput_py0
 
 example.Throughput_py.conf.default.maxsize: 1000000