[openrtm-commit:01636] r626 - in branches/RELENG_1_1/OpenRTM-aist-Python: . OpenRTM_aist/examples/TkJoyStick

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2015-10-29 11:06:18 +0900 (Thu, 29 Oct 2015)
New Revision: 626

Modified:
   branches/RELENG_1_1/OpenRTM-aist-Python/
   branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/examples/TkJoyStick/tkjoystick.py
Log:
[compat,merge] r625 merged from trunk.


Property changes on: branches/RELENG_1_1/OpenRTM-aist-Python
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_0/OpenRTM-aist-Python:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python:396-478
/trunk/OpenRTM-aist-Python:498-500,502,511,543-547,559,563,565-568,570-586,591-605,607-610,614,617,620
   + /branches/RELENG_1_0/OpenRTM-aist-Python:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python:396-478
/trunk/OpenRTM-aist-Python:498-500,502,511,543-547,559,563,565-568,570-586,591-605,607-610,614,617,620,625

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/examples/TkJoyStick/tkjoystick.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/examples/TkJoyStick/tkjoystick.py	2015-10-28 22:44:46 UTC (rev 625)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/examples/TkJoyStick/tkjoystick.py	2015-10-29 02:06:18 UTC (rev 626)
@@ -119,7 +119,7 @@
             circnum = 0
         else:
             circnum = max(self.width, self.height) / self.pitch
-        circrange = range(circnum)
+        circrange = range(int(circnum))
         circrange.reverse()
         for i in circrange:
             x0 = self.x - self.pitch * i