[openrtm-commit:00393] r469 - branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: kurihara
Date: 2011-09-08 11:42:30 +0900 (Thu, 08 Sep 2011)
New Revision: 469

Modified:
   branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/InPort.py
   branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/OutPort.py
Log:
The Time class had been deleted.

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/InPort.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/InPort.py	2011-09-08 02:41:33 UTC (rev 468)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/InPort.py	2011-09-08 02:42:30 UTC (rev 469)
@@ -18,60 +18,12 @@
 from omniORB import any
 import sys
 import copy
+import time
 
 import OpenRTM_aist
 
-TIMEOUT_TICK_USEC = 10.0
-USEC_PER_SEC      = 1000000.0
-TIMEOUT_TICK_SEC = TIMEOUT_TICK_USEC/USEC_PER_SEC
-
-
-import time
-
-
-
 ##
 # @if jp
-# @class Time
-# @brief 時間管理用クラス
-# 
-# 指定した時間値を保持するためのクラス。
-# 
-# @since 0.4.1
-# 
-# @else
-# 
-# @endif
-class Time:
-
-
-
-  ##
-  # @if jp
-  # @brief コンストラクタ
-  #
-  # コンストラクタ。
-  #
-  # @param self
-  #
-  # @else
-  # @brief Constructor.
-  #
-  # Constructor.
-  #
-  # @param self
-  #
-  # @endif
-  def __init__(self):
-    tm = time.time()
-    tm_f       = tm - int(tm)     # 小数部の取り出し
-    self.sec   = int(tm - tm_f)   # 整数部の取り出し
-    self.usec  = int(tm_f * USEC_PER_SEC) # sec -> usec (micro second)
-
-
-
-##
-# @if jp
 #
 # @class InPort
 #

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/OutPort.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/OutPort.py	2011-09-08 02:41:33 UTC (rev 468)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/OutPort.py	2011-09-08 02:42:30 UTC (rev 469)
@@ -22,16 +22,6 @@
 
 import OpenRTM_aist
 
-##
-# @if jp
-# @brief 時間単位変換用定数
-# @else
-# @endif
-TIMEVALUE_ONE_SECOND_IN_USECS = 1000000 # 1 [sec] = 1000000 [usec]
-
-
-import time
-
 # for C++
 # template <class DataType>
 # void setTimestamp(DataType& data)
@@ -44,47 +34,6 @@
 
 ##
 # @if jp
-# @class Time
-# @brief 時間管理用クラス
-# 
-# 指定した時間値を保持するためのクラス。
-# 
-# @since 0.4.1
-# 
-# @else
-# 
-# @endif
-class Time:
-
-
-
-  ##
-  # @if jp
-  # @brief コンストラクタ
-  #
-  # コンストラクタ。
-  #
-  # @param self
-  #
-  # @else
-  # @brief Constructor.
-  #
-  # Constructor.
-  #
-  # @param self
-  #
-  # @endif
-  def __init__(self):
-    global TIMEVALUE_ONE_SECOND_IN_USECS
-    tm = time.time()
-    tm_f       = tm - int(tm)     # 小数部の取り出し
-    self.sec   = int(tm - tm_f)   # 整数部の取り出し
-    self.usec  = int(tm_f * TIMEVALUE_ONE_SECOND_IN_USECS) # sec -> usec (micro second)
-
-
-
-##
-# @if jp
 #
 # @class OutPort
 #
@@ -183,7 +132,6 @@
   # @endif
   # bool operator<<(DataType& value)
   def write(self, value=None):
-    global TIMEVALUE_ONE_SECOND_IN_USECS
     if not value:
       value=self._value