[openrtm-commit:02198] r2822 - branches/FSM4RTC/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2017-01-10 09:30:01 +0900 (Tue, 10 Jan 2017)
New Revision: 2822

Modified:
   branches/FSM4RTC/OpenRTM-aist/src/lib/rtm/RTObject.h
Log:
[FSM4RTC,incompat,new funcs] add/remove functions for FSM listeners have been added. refs #3681

Modified: branches/FSM4RTC/OpenRTM-aist/src/lib/rtm/RTObject.h
===================================================================
--- branches/FSM4RTC/OpenRTM-aist/src/lib/rtm/RTObject.h	2017-01-10 00:18:58 UTC (rev 2821)
+++ branches/FSM4RTC/OpenRTM-aist/src/lib/rtm/RTObject.h	2017-01-10 00:30:01 UTC (rev 2822)
@@ -4887,7 +4887,7 @@
 
 
 
-  protected:
+    //  protected:
     /*!
      * @if jp
      *
@@ -5049,11 +5049,54 @@
       m_actionListeners.ecaction_[EC_DETACHED].notify(ec_id);
     }
 
-    inline void onFsmStateChanged(const char* state)
+    /*!
+     * FSM related listeners
+     */
+    inline void preOnFsmInit(const char* state)
     {
+      m_fsmActionListeners.preaction_[PRE_ON_INIT].notify(state);
+    }
+    inline void preOnFsmEntry(const char* state)
+    {
+      m_fsmActionListeners.preaction_[PRE_ON_ENTRY].notify(state);
+    }
+    inline void preOnFsmDo(const char* state)
+    {
+      m_fsmActionListeners.preaction_[PRE_ON_DO].notify(state);
+    }
+    inline void preOnFsmExit(const char* state)
+    {
+      m_fsmActionListeners.preaction_[PRE_ON_EXIT].notify(state);
+    }
+    inline void preOnFsmStateChange(const char* state)
+    {
       m_fsmActionListeners.preaction_[PRE_ON_STATE_CHANGE].notify(state);
     }
+    /*!
+     * FSM related listeners
+     */
+    inline void postOnFsmInit(const char* state, ReturnCode_t ret)
+    {
+      m_fsmActionListeners.postaction_[POST_ON_INIT].notify(state, ret);
+    }
+    inline void postOnFsmEntry(const char* state, ReturnCode_t ret)
+    {
+      m_fsmActionListeners.postaction_[POST_ON_ENTRY].notify(state, ret);
+    }
+    inline void postOnFsmDo(const char* state, ReturnCode_t ret)
+    {
+      m_fsmActionListeners.postaction_[POST_ON_DO].notify(state, ret);
+    }
+    inline void postOnFsmExit(const char* state, ReturnCode_t ret)
+    {
+      m_fsmActionListeners.postaction_[POST_ON_EXIT].notify(state, ret);
+    }
+    inline void postOnFsmStateChange(const char* state, ReturnCode_t ret)
+    {
+      m_fsmActionListeners.postaction_[POST_ON_STATE_CHANGE].notify(state, ret);
+    }
 
+    
     ReturnCode_t getInheritedECOptions(coil::Properties& default_opts);
 
     /*!