[openrtm-commit:02152] r765 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2016-12-01 15:54:37 +0900 (Thu, 01 Dec 2016)
New Revision: 765

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/CORBA_RTCUtil.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigAdmin.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/PortAdmin.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/PortBase.py
Log:
[compat,bugfix,->RELENG_1_2] fixed bug.

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/CORBA_RTCUtil.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/CORBA_RTCUtil.py	2016-12-01 04:24:01 UTC (rev 764)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/CORBA_RTCUtil.py	2016-12-01 06:54:37 UTC (rev 765)
@@ -113,15 +113,15 @@
     return RTC.ExecutionContext._nil
   if CORBA.is_nil(rtc):
     return RTC.ExecutionContext._nil
-  if ec_id < 1000:
+  if ec_id < OpenRTM_aist.RTObject.ECOTHER_OFFSET:
     eclist = rtc.get_owned_contexts()
     if ec_id >= len(eclist):
       return RTC.ExecutionContext._nil
     if CORBA.is_nil(eclist[ec_id]):
       return RTC.ExecutionContext._nil
     return eclist[ec_id]
-  elif ec_id >= 1000:
-    pec_id = ec_id - 1000
+  elif ec_id >= OpenRTM_aist.RTObject.ECOTHER_OFFSET:
+    pec_id = ec_id - OpenRTM_aist.RTObject.ECOTHER_OFFSET
     eclist = rtc.get_participating_contexts()
     if pec_id >= len(eclist):
       return RTC.ExecutionContext._nil
@@ -168,7 +168,7 @@
   for e in eclist_pec:
     if not CORBA.is_nil(e):
       if e._is_equivalent(ec):
-        return count+1000
+        return count+OpenRTM_aist.RTObject.ECOTHER_OFFSET
     count += 1
   return -1
   
@@ -529,8 +529,8 @@
   ec = get_actual_ec(rtc)
   if CORBA.is_nil(ec):
     return []
-  prifile = ec.get_profile()
-  return prifile.participants
+  profile = ec.get_profile()
+  return profile.participants
 
 
 ##

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigAdmin.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigAdmin.py	2016-12-01 04:24:01 UTC (rev 764)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigAdmin.py	2016-12-01 06:54:37 UTC (rev 765)
@@ -130,7 +130,7 @@
   # @endif
   def __init__(self, name, var, def_val, trans=None):
     self.name = name
-    self._default_value = def_val
+    self.default_value = def_val
     self.string_value = ""
     self.callback = None
     self._var = var
@@ -631,6 +631,7 @@
   #
   def update(self, config_set=None, config_param=None):
     # update(const char* config_set)
+    
     if config_set and config_param is None:
       if self._configsets.hasKey(config_set) is None:
         return

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/PortAdmin.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/PortAdmin.py	2016-12-01 04:24:01 UTC (rev 764)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/PortAdmin.py	2016-12-01 06:54:37 UTC (rev 765)
@@ -300,8 +300,8 @@
         return False
       self._portRefs.append(port.getPortRef())
       return self._portServants.registerObject(port)
-    return False
 
+
   # new interface. since 1.0.0-RELEASE
   # void addPort(PortService_ptr port);
   # def addPortByReference(self, port_ref):

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/PortBase.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/PortBase.py	2016-12-01 04:24:01 UTC (rev 764)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/PortBase.py	2016-12-01 06:54:37 UTC (rev 765)
@@ -1535,7 +1535,7 @@
   #
   #@endif
   def publishInterfaces(self, connector_profile):
-    pass
+    return RTC.BAD_PARAMETER
 
 
   ##
@@ -1737,7 +1737,7 @@
   #
   # @endif
   def unsubscribeInterfaces(self, connector_profile):
-    pass
+    return RTC.BAD_PARAMETER
 
 
   ##