[openrtm-commit:01746] r768 - trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port

[openrtm ＠ openrtm.org]

Author: win-ei
Date: 2016-02-23 00:52:20 +0900 (Tue, 23 Feb 2016)
New Revision: 768

Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortBase.java
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.java
Log:
Now properties given by rtc.conf are merged to PortProfile.properties.

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortBase.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortBase.java	2016-02-22 13:24:37 UTC (rev 767)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortBase.java	2016-02-22 15:52:20 UTC (rev 768)
@@ -301,8 +301,29 @@
      */
     public void init(Properties prop) {
         rtcout.println(Logbuf.TRACE, "init()");
+        rtcout.println(Logbuf.PARANOID, "given properties:");
+        String str = new String();
+        prop._dump(str,prop,0);
+        rtcout.println(Logbuf.DEBUG, str);
 
+        rtcout.println(Logbuf.PARANOID, "m_properties:");
+        str = "";
+        m_properties._dump(str,m_properties,0);
+        rtcout.println(Logbuf.DEBUG, str);
+
         m_properties.merge(prop);
+
+        NVListHolder nvlistholder1 = new NVListHolder();
+        NVUtil.copyFromProperties(nvlistholder1, m_properties);
+        NVListHolder nvlistholder2 = new NVListHolder(m_profile.properties);
+        CORBA_SeqUtil.push_back_list(nvlistholder2, nvlistholder1);
+        m_profile.properties = nvlistholder2.value;
+
+        rtcout.println(Logbuf.PARANOID, "updated properties:");
+        str = "";
+        m_properties._dump(str,m_properties,0);
+        rtcout.println(Logbuf.DEBUG, str);
+
         if (m_singlebuffer) {
             rtcout.println(Logbuf.DEBUG, "single buffer mode.");
             final BufferFactory<RingBuffer<OutputStream>,String> factory 

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.java	2016-02-22 13:24:37 UTC (rev 767)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.java	2016-02-22 15:52:20 UTC (rev 768)
@@ -94,8 +94,21 @@
         String str = new String();
         prop._dump(str,prop,0);
         rtcout.println(Logbuf.DEBUG, str);
+
+        rtcout.println(Logbuf.PARANOID, "m_properties:");
+        str = "";
+        m_properties._dump(str,m_properties,0);
+        rtcout.println(Logbuf.DEBUG, str);
+
         m_properties.merge(prop);
 
+        NVListHolder nvlistholder1 = new NVListHolder();
+        NVUtil.copyFromProperties(nvlistholder1, m_properties);
+        NVListHolder nvlistholder2 = new NVListHolder(m_profile.properties);
+        CORBA_SeqUtil.push_back_list(nvlistholder2, nvlistholder1);
+        m_profile.properties = nvlistholder2.value;
+
+
         rtcout.println(Logbuf.PARANOID, "updated properties:");
         str = "";
         m_properties._dump(str,m_properties,0);