[openrtm-commit:01144] r454 - branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/template/safety

openrtm @ openrtm.org openrtm @ openrtm.org
2014年 1月 5日 (日) 16:11:01 JST


Author: win-ei
Date: 2014-01-05 16:11:01 +0900 (Sun, 05 Jan 2014)
New Revision: 454

Modified:
   branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/template/safety/Safety_RTC.c.vsl
   branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/template/safety/Safety_RTC.h.vsl
Log:
'Daily

Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/template/safety/Safety_RTC.c.vsl
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/template/safety/Safety_RTC.c.vsl	2014-01-05 05:52:35 UTC (rev 453)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/template/safety/Safety_RTC.c.vsl	2014-01-05 07:11:01 UTC (rev 454)
@@ -25,7 +25,7 @@
  * @retval
  * @retval
  */
-PUBLIC ReturnCode_t ${rtcParam.name}_create(${rtcParam.name}* pself)
+PUBLIC ReturnCode_t ${rtcParam.name}_create(${rtcParam.name}_t* pself)
 {
   ReturnCode_t retVal = RTC_OK;
     
@@ -37,51 +37,15 @@
   if( retVal == RTC_OK )
     {
       pself->onInitialize  = ${rtcParam.name}_on_initialize;
-#if(${rtcParam.IsNotImplemented(1)})
-//      pself->onFinalize    = ${rtcParam.name}_on_finalize;
-#else 
-      pself->onFinalize    = ${rtcParam.name}_on_finalize;
-#end
-#if(${rtcParam.IsNotImplemented(2)})
-//      pself->onStartup     = ${rtcParam.name}_on_startup;
-#else
-      pself->onStartup     = ${rtcParam.name}_on_startup;
-#end
-#if(${rtcParam.IsNotImplemented(3)})
-//      pself->onShutdown    = ${rtcParam.name}_on_shutdown;
-#else
-      pself->onShutdown    = ${rtcParam.name}_on_shutdown;
-#end
-#if(${rtcParam.IsNotImplemented(4)})
-//      pself->onActivated   = ${rtcParam.name}_on_activated;
-#else
-      pself->onActivated   = ${rtcParam.name}_on_activated;
-#end
-#if(${rtcParam.IsNotImplemented(5)})
-//      pself->onDeactivated = ${rtcParam.name}_on_deactivated;
-#else
-      pself->onDeactivated = ${rtcParam.name}_on_deactivated;
-#end
-#if(${rtcParam.IsNotImplemented(6)})
-//      pself->onAborting    = ${rtcParam.name}_on_aborting;
-#else
-      pself->onAborting    = ${rtcParam.name}_on_aborting;
-#end
-#if(${rtcParam.IsNotImplemented(7)})
-//      pself->onError       = ${rtcParam.name}_on_error;
-#else
-      pself->onError       = ${rtcParam.name}_on_error;
-#end
-#if(${rtcParam.IsNotImplemented(8)})
-//      pself->onReset       = ${rtcParam.name}_on_reset;
-#else
-      pself->onReset       = ${rtcParam.name}_on_reset;
-#end
-#if(${rtcParam.IsNotImplemented(9)})
-//      pself->onExecute     = ${rtcParam.name}_on_execute;
-#else
-      pself->onExecute     = ${rtcParam.name}_on_execute;
-#end
+#if(${rtcParam.IsNotImplemented(1)})//#end pself->onFinalize    = ${rtcParam.name}_on_finalize;
+#if(${rtcParam.IsNotImplemented(2)})//#end pself->onStartup     = ${rtcParam.name}_on_startup;
+#if(${rtcParam.IsNotImplemented(3)})//#end pself->onShutdown    = ${rtcParam.name}_on_shutdown;
+#if(${rtcParam.IsNotImplemented(4)})//#end pself->onActivated   = ${rtcParam.name}_on_activated;
+#if(${rtcParam.IsNotImplemented(5)})//#end pself->onDeactivated = ${rtcParam.name}_on_deactivated;
+#if(${rtcParam.IsNotImplemented(6)})//#end pself->onAborting    = ${rtcParam.name}_on_aborting;
+#if(${rtcParam.IsNotImplemented(7)})//#end pself->onError       = ${rtcParam.name}_on_error;
+#if(${rtcParam.IsNotImplemented(8)})//#end pself->onReset       = ${rtcParam.name}_on_reset;
+#if(${rtcParam.IsNotImplemented(9)})//#end pself->onExecute     = ${rtcParam.name}_on_execute;
     }
 
   return retVal;

Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/template/safety/Safety_RTC.h.vsl
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/template/safety/Safety_RTC.h.vsl	2014-01-05 05:52:35 UTC (rev 453)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/template/safety/Safety_RTC.h.vsl	2014-01-05 07:11:01 UTC (rev 454)
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- RTMSafety -*-
 /*!
  * @file  ${rtcParam.name}.h
  * @brief ${rtcParam.description}
@@ -7,18 +7,16 @@
  * ${dol}Id${dol}
  */
 
-${sharp}ifndef ${rtcParam.name.toUpperCase()}_H
-${sharp}define ${rtcParam.name.toUpperCase()}_H
+${sharp}ifndef _${rtcParam.name.toUpperCase()}_H
+${sharp}define _${rtcParam.name.toUpperCase()}_H
 
-${sharp}include <rtm/Manager.h>
-${sharp}include <rtm/${rtcParam.componentKind}Base.h>
-${sharp}include <rtm/CorbaPort.h>
-${sharp}include <rtm/DataInPort.h>
-${sharp}include <rtm/DataOutPort.h>
-${sharp}include <rtm/idl/BasicDataTypeSkel.h>
-${sharp}include <rtm/idl/ExtendedDataTypesSkel.h>
-${sharp}include <rtm/idl/InterfaceDataTypesSkel.h>
+${sharp}include "RTMSafetyCommon.h"
+${sharp}include "RtObject.h"
+${sharp}include "DataPort.h"
 
+typedef RtObject_t ${rtcParam.name.toUpperCase()}_t;
+
+
 // Service implementation headers
 // <rtc-template block="service_impl_h">
 #foreach($providerIdlFile in ${rtcParam.providerIdlPathes})
@@ -35,13 +33,11 @@
 
 // </rtc-template>
 
-using namespace RTC;
 #foreach($type in ${cXXConv.getPortModules(${rtcParam})})
 ${cXXConv.getDataportUsingNamespace(${type})}
 #end
 
 /*!
- * @class ${rtcParam.name}
  * @brief ${rtcParam.description}
 #if( ${rtcParam.docDescription.length()} > 0 )
  *
@@ -61,35 +57,9 @@
 #end
  *
  */
-class ${rtcParam.name}
-  : public RTC::${rtcParam.componentKind}Base
-{
- public:
-  /*!
-   * @brief constructor
-   * @param manager Maneger Object
-   */
-  ${rtcParam.name}(RTC::Manager* manager);
 
-  /*!
-   * @brief destructor
-   */
-  ~${rtcParam.name}();
+IMPORT ReturnCode_t ${rtcParam.name}_create(${rtcParam.name}_t* pself);
 
-  // <rtc-template block="public_attribute">
-#foreach($publicAttribute in ${rtcParam.publicAttributes})
-  ${publicAttribute}
-#end
-  
-  // </rtc-template>
-
-  // <rtc-template block="public_operation">
-#foreach($publicOperation in ${rtcParam.publicOperations})
-  ${publicOperation}
-#end
-  
-  // </rtc-template>
-
   /***
 #if(${rtcParam.getDocActionOverView(0).length()}>0)   * ${tmpltHelper.convertDescDoc(${rtcParam.getDocActionOverView(0)})}
 #end
@@ -97,7 +67,7 @@
    * The initialize action (on CREATED->ALIVE transition)
    * formaer rtc_init_entry() 
    *
-   * @return RTC::ReturnCode_t
+   * @return ReturnCode_t
    * 
 #if(${rtcParam.getDocActionPreCondition(0).length()}>0)   * @pre ${tmpltHelper.convertPreDoc(${rtcParam.getDocActionPreCondition(0)})}
 #end
@@ -105,7 +75,7 @@
 #end
    * 
    */
-  #if(${rtcParam.configParams.size()}==0 && ${rtcParam.IsNotImplemented(0)} && ${rtcParam.inports.size()}==0 && ${rtcParam.outports.size()}==0 && ${rtcParam.servicePorts.size()}==0)//#end virtual RTC::ReturnCode_t onInitialize();
+  #if(${rtcParam.configParams.size()}==0 && ${rtcParam.IsNotImplemented(0)} && ${rtcParam.inports.size()}==0 && ${rtcParam.outports.size()}==0 && ${rtcParam.servicePorts.size()}==0)//#end IMPORT ReturnCode_t ${rtcParam.name}_on_initialize( void );
 
   /***
 #if(${rtcParam.getDocActionOverView(0).length()}>0)   * ${tmpltHelper.convertDescDoc(${rtcParam.getDocActionOverView(1)})}
@@ -114,7 +84,7 @@
    * The finalize action (on ALIVE->END transition)
    * formaer rtc_exiting_entry()
    *
-   * @return RTC::ReturnCode_t
+   * @return ReturnCode_t
    * 
 #if(${rtcParam.getDocActionPreCondition(1).length()}>0)   * @pre ${tmpltHelper.convertPreDoc(${rtcParam.getDocActionPreCondition(1)})}
 #end
@@ -122,7 +92,7 @@
 #end
    * 
    */
-  #if(${rtcParam.IsNotImplemented(1)})//#end virtual RTC::ReturnCode_t onFinalize();
+  #if(${rtcParam.IsNotImplemented(1)})//#end IMPORT ReturnCode_t ${rtcParam.name}_on_finalize( void );
 
   /***
 #if(${rtcParam.getDocActionOverView(2).length()}>0)   * ${tmpltHelper.convertDescDoc(${rtcParam.getDocActionOverView(2)})}
@@ -131,9 +101,7 @@
    * The startup action when ExecutionContext startup
    * former rtc_starting_entry()
    *
-   * @param ec_id target ExecutionContext Id
-   *
-   * @return RTC::ReturnCode_t
+   * @return ReturnCode_t
    * 
 #if(${rtcParam.getDocActionPreCondition(2).length()}>0)   * @pre ${tmpltHelper.convertPreDoc(${rtcParam.getDocActionPreCondition(2)})}
 #end
@@ -141,7 +109,7 @@
 #end
    * 
    */
-  #if(${rtcParam.IsNotImplemented(2)})//#end virtual RTC::ReturnCode_t onStartup(RTC::UniqueId ec_id);
+  #if(${rtcParam.IsNotImplemented(2)})//#end IMPORT ReturnCode_t ${rtcParam.name}_on_startup( void );
 
   /***
 #if(${rtcParam.getDocActionOverView(3).length()}>0)   * ${tmpltHelper.convertDescDoc(${rtcParam.getDocActionOverView(3)})}
@@ -150,9 +118,7 @@
    * The shutdown action when ExecutionContext stop
    * former rtc_stopping_entry()
    *
-   * @param ec_id target ExecutionContext Id
-   *
-   * @return RTC::ReturnCode_t
+   * @return ReturnCode_t
    * 
 #if(${rtcParam.getDocActionPreCondition(3).length()}>0)   * @pre ${tmpltHelper.convertPreDoc(${rtcParam.getDocActionPreCondition(3)})}
 #end
@@ -160,7 +126,7 @@
 #end
    * 
    */
-  #if(${rtcParam.IsNotImplemented(3)})//#end virtual RTC::ReturnCode_t onShutdown(RTC::UniqueId ec_id);
+  #if(${rtcParam.IsNotImplemented(3)})//#end IMPORT ReturnCode_t ${rtcParam.name}_on_shutdown( void );
 
   /***
 #if(${rtcParam.getDocActionOverView(4).length()}>0)   * ${tmpltHelper.convertDescDoc(${rtcParam.getDocActionOverView(4)})}
@@ -169,9 +135,7 @@
    * The activated action (Active state entry action)
    * former rtc_active_entry()
    *
-   * @param ec_id target ExecutionContext Id
-   *
-   * @return RTC::ReturnCode_t
+   * @return ReturnCode_t
    * 
 #if(${rtcParam.getDocActionPreCondition(4).length()}>0)   * @pre ${tmpltHelper.convertPreDoc(${rtcParam.getDocActionPreCondition(4)})}
 #end
@@ -179,7 +143,7 @@
 #end
    * 
    */
-  #if(${rtcParam.IsNotImplemented(4)})//#end virtual RTC::ReturnCode_t onActivated(RTC::UniqueId ec_id);
+  #if(${rtcParam.IsNotImplemented(4)})//#end IMPORT ReturnCode_t ${rtcParam.name}_on_activated( void );
 
   /***
 #if(${rtcParam.getDocActionOverView(5).length()}>0)   * ${tmpltHelper.convertDescDoc(${rtcParam.getDocActionOverView(5)})}
@@ -188,9 +152,7 @@
    * The deactivated action (Active state exit action)
    * former rtc_active_exit()
    *
-   * @param ec_id target ExecutionContext Id
-   *
-   * @return RTC::ReturnCode_t
+   * @return ReturnCode_t
    * 
 #if(${rtcParam.getDocActionPreCondition(5).length()}>0)   * @pre ${tmpltHelper.convertPreDoc(${rtcParam.getDocActionPreCondition(5)})}
 #end
@@ -198,37 +160,16 @@
 #end
    * 
    */
-  #if(${rtcParam.IsNotImplemented(5)})//#end virtual RTC::ReturnCode_t onDeactivated(RTC::UniqueId ec_id);
+  #if(${rtcParam.IsNotImplemented(5)})//#end IMPORT ReturnCode_t ${rtcParam.name}_on_deactivated( void );
 
   /***
-#if(${rtcParam.getDocActionOverView(9).length()}>0)   * ${tmpltHelper.convertDescDoc(${rtcParam.getDocActionOverView(9)})}
-#end
-   *
-   * The execution action that is invoked periodically
-   * former rtc_active_do()
-   *
-   * @param ec_id target ExecutionContext Id
-   *
-   * @return RTC::ReturnCode_t
-   * 
-#if(${rtcParam.getDocActionPreCondition(9).length()}>0)   * @pre ${tmpltHelper.convertPreDoc(${rtcParam.getDocActionPreCondition(9)})}
-#end
-#if(${rtcParam.getDocActionPostCondition(9).length()}>0)   * @post ${tmpltHelper.convertPostDoc(${rtcParam.getDocActionPostCondition(9)})}
-#end
-   * 
-   */
-  #if(${rtcParam.IsNotImplemented(9)})//#end virtual RTC::ReturnCode_t onExecute(RTC::UniqueId ec_id);
-
-  /***
 #if(${rtcParam.getDocActionOverView(6).length()}>0)   * ${tmpltHelper.convertDescDoc(${rtcParam.getDocActionOverView(6)})}
 #end
    *
    * The aborting action when main logic error occurred.
    * former rtc_aborting_entry()
    *
-   * @param ec_id target ExecutionContext Id
-   *
-   * @return RTC::ReturnCode_t
+   * @return ReturnCode_t
    * 
 #if(${rtcParam.getDocActionPreCondition(6).length()}>0)   * @pre ${tmpltHelper.convertPreDoc(${rtcParam.getDocActionPreCondition(6)})}
 #end
@@ -236,7 +177,7 @@
 #end
    * 
    */
-  #if(${rtcParam.IsNotImplemented(6)})//#end virtual RTC::ReturnCode_t onAborting(RTC::UniqueId ec_id);
+  #if(${rtcParam.IsNotImplemented(6)})//#end IMPORT ReturnCode_t ${rtcParam.name}_on_aborting( void );
 
   /***
 #if(${rtcParam.getDocActionOverView(7).length()}>0)   * ${tmpltHelper.convertDescDoc(${rtcParam.getDocActionOverView(7)})}
@@ -245,9 +186,7 @@
    * The error action in ERROR state
    * former rtc_error_do()
    *
-   * @param ec_id target ExecutionContext Id
-   *
-   * @return RTC::ReturnCode_t
+   * @return ReturnCode_t
    * 
 #if(${rtcParam.getDocActionPreCondition(7).length()}>0)   * @pre ${tmpltHelper.convertPreDoc(${rtcParam.getDocActionPreCondition(7)})}
 #end
@@ -255,7 +194,7 @@
 #end
    * 
    */
-  #if(${rtcParam.IsNotImplemented(7)})//#end virtual RTC::ReturnCode_t onError(RTC::UniqueId ec_id);
+  #if(${rtcParam.IsNotImplemented(7)})//#end IMPORT ReturnCode_t ${rtcParam.name}_on_error( void );
 
   /***
 #if(${rtcParam.getDocActionOverView(8).length()}>0)   * ${tmpltHelper.convertDescDoc(${rtcParam.getDocActionOverView(8)})}
@@ -264,9 +203,7 @@
    * The reset action that is invoked resetting
    * This is same but different the former rtc_init_entry()
    *
-   * @param ec_id target ExecutionContext Id
-   *
-   * @return RTC::ReturnCode_t
+   * @return ReturnCode_t
    * 
 #if(${rtcParam.getDocActionPreCondition(8).length()}>0)   * @pre ${tmpltHelper.convertPreDoc(${rtcParam.getDocActionPreCondition(8)})}
 #end
@@ -274,225 +211,24 @@
 #end
    * 
    */
-  #if(${rtcParam.IsNotImplemented(8)})//#end virtual RTC::ReturnCode_t onReset(RTC::UniqueId ec_id);
-  
-  /***
-#if(${rtcParam.getDocActionOverView(10).length()}>0)   * ${tmpltHelper.convertDescDoc(${rtcParam.getDocActionOverView(10)})}
-#end
-   *
-   * The state update action that is invoked after onExecute() action
-   * no corresponding operation exists in OpenRTm-aist-0.2.0
-   *
-   * @param ec_id target ExecutionContext Id
-   *
-   * @return RTC::ReturnCode_t
-   * 
-#if(${rtcParam.getDocActionPreCondition(10).length()}>0)   * @pre ${tmpltHelper.convertPreDoc(${rtcParam.getDocActionPreCondition(10)})}
-#end
-#if(${rtcParam.getDocActionPostCondition(10).length()}>0)   * @post ${tmpltHelper.convertPostDoc(${rtcParam.getDocActionPostCondition(10)})}
-#end
-   * 
-   */
-  #if(${rtcParam.IsNotImplemented(10)})//#end virtual RTC::ReturnCode_t onStateUpdate(RTC::UniqueId ec_id);
+  #if(${rtcParam.IsNotImplemented(8)})//#end IMPORT ReturnCode_t ${rtcParam.name}_on_reset( void );
 
   /***
-#if(${rtcParam.getDocActionOverView(11).length()}>0)   * ${tmpltHelper.convertDescDoc(${rtcParam.getDocActionOverView(11)})}
+#if(${rtcParam.getDocActionOverView(9).length()}>0)   * ${tmpltHelper.convertDescDoc(${rtcParam.getDocActionOverView(9)})}
 #end
    *
-   * The action that is invoked when execution context's rate is changed
-   * no corresponding operation exists in OpenRTm-aist-0.2.0
+   * The execution action that is invoked periodically
+   * former rtc_active_do()
    *
-   * @param ec_id target ExecutionContext Id
-   *
    * @return RTC::ReturnCode_t
    * 
-#if(${rtcParam.getDocActionPreCondition(11).length()}>0)   * @pre ${tmpltHelper.convertPreDoc(${rtcParam.getDocActionPreCondition(11)})}
+#if(${rtcParam.getDocActionPreCondition(9).length()}>0)   * @pre ${tmpltHelper.convertPreDoc(${rtcParam.getDocActionPreCondition(9)})}
 #end
-#if(${rtcParam.getDocActionPostCondition(11).length()}>0)   * @post ${tmpltHelper.convertPostDoc(${rtcParam.getDocActionPostCondition(11)})}
+#if(${rtcParam.getDocActionPostCondition(9).length()}>0)   * @post ${tmpltHelper.convertPostDoc(${rtcParam.getDocActionPostCondition(9)})}
 #end
    * 
    */
-  #if(${rtcParam.IsNotImplemented(11)})//#end virtual RTC::ReturnCode_t onRateChanged(RTC::UniqueId ec_id);
+  #if(${rtcParam.IsNotImplemented(9)})//#end IMPORT ReturnCode_t ${rtcParam.name}_on_execute( void );
 
-
- protected:
-  // <rtc-template block="protected_attribute">
-#foreach($protectedAttribute in ${rtcParam.protectedAttributes})
-  ${protectedAttribute}
-#end
-  
-  // </rtc-template>
-
-  // <rtc-template block="protected_operation">
-#foreach($protectedOperation in ${rtcParam.protectedOperations})
-  ${protectedOperation}
-#end
-  
-  // </rtc-template>
-
-  // Configuration variable declaration
-  // <rtc-template block="config_declare">
-#if( ${rtcParam.configParams.size()} > 0 )
-#foreach($configParam in ${rtcParam.configParams})
-  /*!
-   * ${tmpltHelper.convertDescDoc(${configParam.docDescription})}
-   * - Name: ${configParam.docDataName} ${configParam.tmplVarName}
-   * - DefaultValue: ${configParam.defaultVal}
-#if(${configParam.docUnit.length()}>0)   * - Unit: ${tmpltHelper.convertUnitDoc(${configParam.docUnit})}
-#end
-#if(${configParam.docRange.length()}>0)   * - Range: ${tmpltHelper.convertRangeDoc(${configParam.docRange})}
-#end
-#if(${configParam.docConstraint.length()}>0)   * - Constraint: ${tmpltHelper.convertConstraintDoc(${configParam.docConstraint})}
-#end
-   */
-  ${cXXConv.convConfigSetType(${configParam.type})} ${rtcParam.commonPrefix}${rtcParam.configurationPrefix}${configParam.tmplVarName}${rtcParam.configurationSuffix}${rtcParam.commonSuffix};
-#end
-#end
-
-  // </rtc-template>
-
-  // DataInPort declaration
-  // <rtc-template block="inport_declare">
-#foreach($port in ${rtcParam.inports})
-#if(${port.type}!="")  ${port.type} ${rtcParam.commonPrefix}${rtcParam.dataPortPrefix}${port.tmplVarName}${rtcParam.dataPortSuffix}${rtcParam.commonSuffix};
-  /*!
-#if(${port.docDescription.length()}>0)   * ${tmpltHelper.convertDescDoc(${port.docDescription})}
-#end
-#if(${port.docType.length()}>0)   * - Type: ${tmpltHelper.convertTypeDoc(${port.docType})}
-#end
-#if(${port.docNum.length()}>0)   * - Number: ${tmpltHelper.convertNumberDoc(${port.docNum})}
-#end
-#if(${port.docSemantics.length()}>0)   * - Semantics: ${tmpltHelper.convertSemanticsDoc(${port.docSemantics})}
-#end
-#if(${port.docUnit.length()}>0)   * - Unit: ${tmpltHelper.convertUnitDoc(${port.docUnit})}
-#end
-#if(${port.docOccurrence.length()}>0)   * - Frequency: ${tmpltHelper.convertFrequencyDoc(${port.docOccurrence})}
-#end
-#if(${port.docOperation.length()}>0)   * - Operation Cycle: ${tmpltHelper.convertCycleDoc(${port.docOperation})}
-#end
-   */
-  InPort<${port.type}> ${rtcParam.commonPrefix}${rtcParam.dataPortPrefix}${port.tmplVarName}In${rtcParam.dataPortSuffix}${rtcParam.commonSuffix};
-#end
-#end
-  
-  // </rtc-template>
-
-
-  // DataOutPort declaration
-  // <rtc-template block="outport_declare">
-#foreach($port in ${rtcParam.outports})
-#if(${port.type}!="")  ${port.type} ${rtcParam.commonPrefix}${rtcParam.dataPortPrefix}${port.tmplVarName}${rtcParam.dataPortSuffix}${rtcParam.commonSuffix};
-  /*!
-#if(${port.docDescription.length()}>0)   * ${tmpltHelper.convertDescDoc(${port.docDescription})}
-#end
-#if(${port.docType.length()}>0)   * - Type: ${tmpltHelper.convertTypeDoc(${port.docType})}
-#end
-#if(${port.docNum.length()}>0)   * - Number: ${tmpltHelper.convertNumberDoc(${port.docNum})}
-#end
-#if(${port.docSemantics.length()}>0)   * - Semantics: ${tmpltHelper.convertSemanticsDoc(${port.docSemantics})}
-#end
-#if(${port.docUnit.length()}>0)   * - Unit: ${tmpltHelper.convertUnitDoc(${port.docUnit})}
-#end
-#if(${port.docOccurrence.length()}>0)   * - Frequency: ${tmpltHelper.convertFrequencyDoc(${port.docOccurrence})}
-#end
-#if(${port.docOperation.length()}>0)   * - Operation Cycle: ${tmpltHelper.convertCycleDoc(${port.docOperation})}
-#end
-   */
-  OutPort<${port.type}> ${rtcParam.commonPrefix}${rtcParam.dataPortPrefix}${port.tmplVarName}Out${rtcParam.dataPortSuffix}${rtcParam.commonSuffix};
-#end
-#end
-  
-  // </rtc-template>
-
-  // CORBA Port declaration
-  // <rtc-template block="corbaport_declare">
-#if(${rtcParam.servicePorts.size()}>0)
-#foreach($servicePort in ${rtcParam.servicePorts})
-#if(${servicePort.servicePortInterfaces.size()}>0)
-  /*!
-#if(${servicePort.docDescription.length()}>0)   * ${tmpltHelper.convertDescDoc(${servicePort.docDescription})}
-#end
-#if(${servicePort.docIfDescription.length()}>0)   * Interface: ${tmpltHelper.convertInterfaceDoc(${servicePort.docIfDescription})}
-#end
-   */
-  RTC::CorbaPort ${rtcParam.commonPrefix}${rtcParam.servicePortPrefix}${servicePort.name}Port${rtcParam.servicePortSuffix}${rtcParam.commonSuffix};
-#end#end#end
-  
-  // </rtc-template>
-
-  // Service declaration
-  // <rtc-template block="service_declare">
-#if(${rtcParam.servicePorts.size()}>0)
-#foreach($servicePort in ${rtcParam.servicePorts})
-#if(${servicePort.servicePortInterfaces.size()}>0)
-#foreach($serviceInterface in ${servicePort.servicePortInterfaces})
-#if(${serviceInterface.index}==0)
-  /*!
-#if(${serviceInterface.docDescription.length()}>0)   * ${tmpltHelper.convertDescDoc(${serviceInterface.docDescription})}
-#end
-#if(${serviceInterface.docArgument.length()}>0)   * - Argument:      ${tmpltHelper.convertInterfaceDetailDoc(${serviceInterface.docArgument})}
-#end
-#if(${serviceInterface.docReturn.length()}>0)   * - Return Value:  ${tmpltHelper.convertInterfaceDetailDoc(${serviceInterface.docReturn})}
-#end
-#if(${serviceInterface.docException.length()}>0)   * - Exception:     ${tmpltHelper.convertInterfaceDetailDoc(${serviceInterface.docException})}
-#end
-#if(${serviceInterface.docPreCondition.length()}>0)   * - PreCondition:  ${tmpltHelper.convertInterfaceDetailDoc(${serviceInterface.docPreCondition})}
-#end
-#if(${serviceInterface.docPostCondition.length()}>0)   * - PostCondition: ${tmpltHelper.convertInterfaceDetailDoc(${serviceInterface.docPostCondition})}
-#end
-   */
-  ${serviceInterface.interfaceRawType}${tmpltHelper.serviceImplSuffix} ${rtcParam.commonPrefix}${rtcParam.serviceIFPrefix}${serviceInterface.tmplVarName}${rtcParam.serviceIFSuffix}${rtcParam.commonSuffix};
-#end#end#end#end#end
-  
-  // </rtc-template>
-
-  // Consumer declaration
-  // <rtc-template block="consumer_declare">
-#if(${rtcParam.servicePorts.size()}>0)
-#foreach($servicePort in ${rtcParam.servicePorts})
-#if(${servicePort.servicePortInterfaces.size()}>0)
-#foreach($serviceInterface in ${servicePort.servicePortInterfaces})
-#if(${serviceInterface.index}==1)
-  /*!
-#if(${serviceInterface.docDescription.length()}>0)   * ${tmpltHelper.convertDescDoc(${serviceInterface.docDescription})}
-#end
-#if(${serviceInterface.docArgument.length()}>0)   * - Argument:      ${tmpltHelper.convertInterfaceDetailDoc(${serviceInterface.docArgument})}
-#end
-#if(${serviceInterface.docReturn.length()}>0)   * - Return Value:  ${tmpltHelper.convertInterfaceDetailDoc(${serviceInterface.docReturn})}
-#end
-#if(${serviceInterface.docException.length()}>0)   * - Exception:     ${tmpltHelper.convertInterfaceDetailDoc(${serviceInterface.docException})}
-#end
-#if(${serviceInterface.docPreCondition.length()}>0)   * - PreCondition:  ${tmpltHelper.convertInterfaceDetailDoc(${serviceInterface.docPreCondition})}
-#end
-#if(${serviceInterface.docPostCondition.length()}>0)   * - PostCondition: ${tmpltHelper.convertInterfaceDetailDoc(${serviceInterface.docPostCondition})}
-#end
-   */
-  RTC::CorbaConsumer<${serviceInterface.interfaceType}> ${rtcParam.commonPrefix}${rtcParam.serviceIFPrefix}${serviceInterface.tmplVarName}${rtcParam.serviceIFSuffix}${rtcParam.commonSuffix};
-#end#end#end#end#end
-  
-  // </rtc-template>
-
- private:
-  // <rtc-template block="private_attribute">
-#foreach($privateAttribute in ${rtcParam.privateAttributes})
-  ${privateAttribute}
-#end
-  
-  // </rtc-template>
-
-  // <rtc-template block="private_operation">
-#foreach($privateOperation in ${rtcParam.privateOperations})
-  ${privateOperation}
-#end
-  
-  // </rtc-template>
-
-};
-
-
-extern "C"
-{
-  DLL_EXPORT void ${rtcParam.name}Init(RTC::Manager* manager);
-};
-
-#endif // ${rtcParam.name.toUpperCase()}_H
+#endif /* !_${rtcParam.name}_H_ */
+ 



More information about the openrtm-commit mailing list