[openrtm-commit:00459] r494 - in trunk/OpenRTM-aist-Python: OpenRTM_aist OpenRTM_aist/examples/ExtTrigger installer

[openrtm ＠ openrtm.org]

Author: kurihara
Date: 2011-10-18 11:01:51 +0900 (Tue, 18 Oct 2011)
New Revision: 494

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/ExtTrigExecutionContext.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/examples/ExtTrigger/run.py
   trunk/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in
Log:
r488-498,r493 merged. refs #2271


Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ExtTrigExecutionContext.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ExtTrigExecutionContext.py	2011-10-17 08:59:03 UTC (rev 493)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ExtTrigExecutionContext.py	2011-10-18 02:01:51 UTC (rev 494)
@@ -96,7 +96,7 @@
     flag = True
 
     while flag:
-      sec_ = float(self._usec)/1000000.0
+      sec_ = float(self._period.usec())/1000000.0
       self._worker._cond.acquire()
       while not self._worker._called and self._running:
         self._worker._cond.wait()

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/examples/ExtTrigger/run.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/examples/ExtTrigger/run.py	2011-10-17 08:59:03 UTC (rev 493)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/examples/ExtTrigger/run.py	2011-10-18 02:01:51 UTC (rev 494)
@@ -27,7 +27,7 @@
     os.system("start python ..\\..\\..\\bin\\rtm-naming.py")
     os.system("start python ConsoleIn.py")
     os.system("start python Consoleout.py")
-    time.sleep(1)
+    time.sleep(2)
     os.system("python Connector.py")
 
 else:

Modified: trunk/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in
===================================================================
--- trunk/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in	2011-10-17 08:59:03 UTC (rev 493)
+++ trunk/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in	2011-10-18 02:01:51 UTC (rev 494)
@@ -139,10 +139,17 @@
           {% for file in RtmOpenrtm_aist24UtilsRtcd.Files %}
           <File Id="{% file.Id %}" Name="{% file.Name %}"
                 DiskId="1" Source="{% file.Source %}">
+            {% if file.Name is rtcd.py %}
             <Shortcut Id="{% file.Id %}" Directory="ToolsMenuFolder"
                       Name="Start RTC daemon"
                       Arguments=' -d -f "[Version]examples\Python\rtcd.conf"'
                       Show="normal" WorkingDirectory="bin"/>
+            {% endif %}
+            {% if file.Name is rtcd.conf %}
+            <Shortcut Id="{% file.Id %}" Directory="ToolsMenuFolder"
+                      Name="rtc.conf for RTC daemon"
+                      Show="normal" WorkingDirectory="bin"/>
+            {% endif %}
           </File>
           {% endfor %}
         </Component>
@@ -291,10 +298,17 @@
           {% for file in RtmOpenrtm_aist25UtilsRtcd.Files %}
           <File Id="{% file.Id %}" Name="{% file.Name %}"
                 DiskId="1" Source="{% file.Source %}">
+            {% if file.Name is rtcd.py %}
             <Shortcut Id="{% file.Id %}" Directory="ToolsMenuFolder"
                       Name="Start RTC daemon"
                       Arguments=' -d -f "[Version]examples\Python\rtcd.conf"'
                       Show="normal" WorkingDirectory="bin"/>
+            {% endif %}
+            {% if file.Name is rtcd.conf %}
+            <Shortcut Id="{% file.Id %}" Directory="ToolsMenuFolder"
+                      Name="rtc.conf for RTC daemon"
+                      Show="normal" WorkingDirectory="bin"/>
+            {% endif %}
           </File>
           {% endfor %}
         </Component>
@@ -443,10 +457,17 @@
           {% for file in RtmOpenrtm_aist26UtilsRtcd.Files %}
           <File Id="{% file.Id %}" Name="{% file.Name %}"
                 DiskId="1" Source="{% file.Source %}">
+            {% if file.Name is rtcd.py %}
             <Shortcut Id="{% file.Id %}" Directory="ToolsMenuFolder"
                       Name="Start RTC daemon"
                       Arguments=' -d -f "[Version]examples\Python\rtcd.conf"'
                       Show="normal" WorkingDirectory="bin"/>
+			{% endif %}
+            {% if file.Name is rtcd.conf %}
+            <Shortcut Id="{% file.Id %}" Directory="ToolsMenuFolder"
+                      Name="rtc.conf for RTC daemon"
+                      Show="normal" WorkingDirectory="bin"/>
+			{% endif %}
           </File>
           {% endfor %}
         </Component>