[openrtm-commit:00332] r444 - branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2011年 8月 9日 (火) 21:33:13 JST
Author: kurihara
Date: 2011-08-09 21:33:12 +0900 (Tue, 09 Aug 2011)
New Revision: 444
Modified:
branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/SdoOrganization.py
Log:
member variable name has been changed.
Modified: branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/SdoOrganization.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/SdoOrganization.py 2011-08-09 12:30:51 UTC (rev 443)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/SdoOrganization.py 2011-08-09 12:33:12 UTC (rev 444)
@@ -67,7 +67,7 @@
self._memberList = []
self._dependency = SDOPackage.OWN
self._objref = self._this()
- self._rtcout = OpenRTM_aist.Manager.instance().getLogbuf("rtobject.sdo_organization")
+ self.__rtcout = OpenRTM_aist.Manager.instance().getLogbuf("rtobject.sdo_organization")
#============================================================
@@ -108,7 +108,7 @@
# completely due to some internal error.
# @endif
def get_organization_id(self):
- self._rtcout.RTC_TRACE("get_organization_id() = %s", self._pId)
+ self.__rtcout.RTC_TRACE("get_organization_id() = %s", self._pId)
return self._pId
@@ -148,7 +148,7 @@
# completely due to some internal error.
# @endif
def get_organization_property(self):
- self._rtcout.RTC_TRACE("get_organization_property()")
+ self.__rtcout.RTC_TRACE("get_organization_property()")
guard = OpenRTM_aist.ScopedLock(self._org_mutex)
prop = SDOPackage.OrganizationProperty(self._orgProperty.properties)
return prop
@@ -195,7 +195,7 @@
# completely due to some internal error.
# @endif
def get_organization_property_value(self, name):
- self._rtcout.RTC_TRACE("get_organization_property_value(%s)", name)
+ self.__rtcout.RTC_TRACE("get_organization_property_value(%s)", name)
if not name:
raise SDOPackage.InvalidParameter("Empty name.")
@@ -208,7 +208,7 @@
value = omniORB.any.to_any(self._orgProperty.properties[index].value)
return value
except:
- self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
+ self.__rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
raise SDOPackage.InternalError("get_organization_property_value()")
# never reach here
@@ -256,7 +256,7 @@
# completely due to some internal error.
# @endif
def add_organization_property(self, org_property):
- self._rtcout.RTC_TRACE("add_organization_property()")
+ self.__rtcout.RTC_TRACE("add_organization_property()")
if org_property is None:
raise SDOPackage.InvalidParameter("org_property is Empty.")
@@ -265,7 +265,7 @@
self._orgProperty = org_property
return True
except:
- self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
+ self.__rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
raise SDOPackage.InternalError("add_organization_property()")
return False
@@ -317,7 +317,7 @@
# completely due to some internal error.
# @endif
def set_organization_property_value(self, name, value):
- self._rtcout.RTC_TRACE("set_organization_property_value(name=%s)", name)
+ self.__rtcout.RTC_TRACE("set_organization_property_value(name=%s)", name)
if not name:
raise SDOPackage.InvalidParameter("set_organization_property_value(): Enpty name.")
@@ -374,7 +374,7 @@
# completely due to some internal error.
# @endif
def remove_organization_property(self, name):
- self._rtcout.RTC_TRACE("remove_organization_property(%s)", name)
+ self.__rtcout.RTC_TRACE("remove_organization_property(%s)", name)
if not name:
raise SDOPackage.InvalidParameter("remove_organization_property_value(): Enpty name.")
@@ -387,7 +387,7 @@
OpenRTM_aist.CORBA_SeqUtil.erase(self._orgProperty.properties, index)
return True
except:
- self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
+ self.__rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
raise SDOPackage.InternalError("remove_organization_property_value()")
return False
@@ -427,7 +427,7 @@
# completely due to some internal error.
# @endif
def get_owner(self):
- self._rtcout.RTC_TRACE("get_owner()")
+ self.__rtcout.RTC_TRACE("get_owner()")
return self._varOwner
@@ -473,7 +473,7 @@
# completely due to some internal error.
# @endif
def set_owner(self, sdo):
- self._rtcout.RTC_TRACE("set_owner()")
+ self.__rtcout.RTC_TRACE("set_owner()")
if CORBA.is_nil(sdo):
raise SDOPackage.InvalidParameter("set_owner()")
@@ -481,7 +481,7 @@
self._varOwner = sdo
return True
except:
- self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
+ self.__rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
raise SDOPackage.InternalError("set_owner()")
return True
@@ -523,11 +523,11 @@
# completely due to some internal error.
# @endif
def get_members(self):
- self._rtcout.RTC_TRACE("get_members()")
+ self.__rtcout.RTC_TRACE("get_members()")
try:
return self._memberList
except:
- self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
+ self.__rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
raise SDOPackage.InternalError("get_members()")
@@ -576,7 +576,7 @@
# completely due to some internal error.
# @endif
def set_members(self, sdos):
- self._rtcout.RTC_TRACE("set_members()")
+ self.__rtcout.RTC_TRACE("set_members()")
if sdos is None:
raise SDOPackage.InvalidParameter("set_members(): SDOList is empty.")
@@ -584,7 +584,7 @@
self._memberList = sdos
return True
except:
- self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
+ self.__rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
raise SDOPackage.InternalError("set_members()")
return True
@@ -629,7 +629,7 @@
# completely due to some internal error.
# @endif
def add_members(self, sdo_list):
- self._rtcout.RTC_TRACE("add_members()")
+ self.__rtcout.RTC_TRACE("add_members()")
if not sdo_list:
raise SDOPackage.InvalidParameter("add_members(): SDOList is empty.")
@@ -637,7 +637,7 @@
OpenRTM_aist.CORBA_SeqUtil.push_back_list(self._memberList, sdo_list)
return True
except:
- self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
+ self.__rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
raise SDOPackage.InternalError("add_members()")
return False
@@ -681,22 +681,22 @@
# completely due to some internal error.
# @endif
def remove_member(self, id):
- self._rtcout.RTC_TRACE("remove_member(%s)", id)
+ self.__rtcout.RTC_TRACE("remove_member(%s)", id)
if not id:
- self._rtcout.RTC_ERROR("remove_member(): Enpty name.")
+ self.__rtcout.RTC_ERROR("remove_member(): Enpty name.")
raise SDOPackage.InvalidParameter("remove_member(): Empty name.")
index = OpenRTM_aist.CORBA_SeqUtil.find(self._memberList, self.sdo_id(id))
if index < 0:
- self._rtcout.RTC_ERROR("remove_member(): Not found.")
+ self.__rtcout.RTC_ERROR("remove_member(): Not found.")
raise SDOPackage.InvalidParameter("remove_member(): Not found.")
try:
OpenRTM_aist.CORBA_SeqUtil.erase(self._memberList, index)
return True
except:
- self._rtcout.RTC_ERROR("unknown exception")
+ self.__rtcout.RTC_ERROR("unknown exception")
raise SDOPackage.InternalError("remove_member(): Not found.")
return False
@@ -741,7 +741,7 @@
# completely due to some internal error.
# @endif
def get_dependency(self):
- self._rtcout.RTC_TRACE("get_dependency()")
+ self.__rtcout.RTC_TRACE("get_dependency()")
return self._dependency
@@ -789,7 +789,7 @@
# completely due to some internal error.
# @endif
def set_dependency(self, dependency):
- self._rtcout.RTC_TRACE("set_dependency()")
+ self.__rtcout.RTC_TRACE("set_dependency()")
if dependency is None:
raise SDOPackage.InvalidParameter("set_dependency(): Empty dependency.")
@@ -797,7 +797,7 @@
self._dependency = dependency
return True
except:
- self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
+ self.__rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
raise SDOPackage.InternalError("set_dependency(): Unknown.")
return False
openrtm-commit メーリングリストの案内