[openrtm-commit:03024] r903 - in branches/FSM4RTC/OpenRTM-aist-Python/OpenRTM_aist: . examples examples/StaticFsm examples/Throughput python3_examples

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-12-15 11:11:05 +0900 (Fri, 15 Dec 2017)
New Revision: 903

Added:
   branches/FSM4RTC/OpenRTM-aist-Python/OpenRTM_aist/examples/Throughput/
   branches/FSM4RTC/OpenRTM-aist-Python/OpenRTM_aist/python3_examples/Throughput/
Modified:
   branches/FSM4RTC/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
   branches/FSM4RTC/OpenRTM-aist-Python/OpenRTM_aist/examples/StaticFsm/rtc.conf
   branches/FSM4RTC/OpenRTM-aist-Python/OpenRTM_aist/examples/Throughput/rtc.conf
Log:
[merge] r884,r901,r902 has been merged from trunk.

Modified: branches/FSM4RTC/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
===================================================================
--- branches/FSM4RTC/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2017-12-15 02:08:20 UTC (rev 902)
+++ branches/FSM4RTC/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2017-12-15 02:11:05 UTC (rev 903)
@@ -3052,7 +3052,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
   #
@@ -3076,10 +3076,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]
@@ -3141,6 +3141,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: branches/FSM4RTC/OpenRTM-aist-Python/OpenRTM_aist/examples/StaticFsm/rtc.conf
===================================================================
--- branches/FSM4RTC/OpenRTM-aist-Python/OpenRTM_aist/examples/StaticFsm/rtc.conf	2017-12-15 02:08:20 UTC (rev 902)
+++ branches/FSM4RTC/OpenRTM-aist-Python/OpenRTM_aist/examples/StaticFsm/rtc.conf	2017-12-15 02:11:05 UTC (rev 903)
@@ -21,20 +21,20 @@
 manager.components.precreate: Microwave
 manager.components.preactivation: Inputbutton0, Microwave0
 manager.components.preconnect: \
-  Inputbutton0.open^Microwave0.event(fsm_event_name=open), \
-  Inputbutton0.close^Microwave0.event(fsm_event_name=close), \
-  Inputbutton0.minute^Microwave0.event(fsm_event_name=minute), \
-  Inputbutton0.start^Microwave0.event(fsm_event_name=start), \
-  Inputbutton0.stop^Microwave0.event(fsm_event_name=stop), \
-  Inputbutton0.tick^Microwave0.event(fsm_event_name=tick)
+  Inputbutton0.open:Microwave0.event(fsm_event_name=open), \
+  Inputbutton0.close:Microwave0.event(fsm_event_name=close), \
+  Inputbutton0.minute:Microwave0.event(fsm_event_name=minute), \
+  Inputbutton0.start:Microwave0.event(fsm_event_name=start), \
+  Inputbutton0.stop:Microwave0.event(fsm_event_name=stop), \
+  Inputbutton0.tick:Microwave0.event(fsm_event_name=tick)
 
 #manager.modules.preload: Display.py
 #manager.components.precreate: Display
 #manager.components.preactivation: Inputbutton0, Display0
 #manager.components.preconnect: \
-#  Inputbutton0.open^Display0.in(), \
-#  Inputbutton0.close^Display0.in(), \
-#  Inputbutton0.minute^Display0.in(), \
-#  Inputbutton0.start^Display0.in(), \
-#  Inputbutton0.stop^Display0.in(), \
-#  Inputbutton0.tick^Display0.in()
\ No newline at end of file
+#  Inputbutton0.open:Display0.in(), \
+#  Inputbutton0.close:Display0.in(), \
+#  Inputbutton0.minute:Display0.in(), \
+#  Inputbutton0.start:Display0.in(), \
+#  Inputbutton0.stop:Display0.in(), \
+#  Inputbutton0.tick:Display0.in()
\ No newline at end of file

Modified: branches/FSM4RTC/OpenRTM-aist-Python/OpenRTM_aist/examples/Throughput/rtc.conf
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/examples/Throughput/rtc.conf	2017-10-14 16:56:08 UTC (rev 884)
+++ branches/FSM4RTC/OpenRTM-aist-Python/OpenRTM_aist/examples/Throughput/rtc.conf	2017-12-15 02:11:05 UTC (rev 903)
@@ -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