[openrtm-commit:01373] r131 - in branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template: . cmake doc doc/content idl include/Template src
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2014年 3月 17日 (月) 18:23:27 JST
Author: kawauchi
Date: 2014-03-17 18:23:27 +0900 (Mon, 17 Mar 2014)
New Revision: 131
Removed:
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/RTC.xml20130613094913
Modified:
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/README.Template
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/RTC.xml
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/cmake/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/cmake/cpack_options.cmake.in
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/cmake/wix.xsl.in
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/doc/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/doc/content/index.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/doc/content/index_j.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/idl/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/include/Template/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/include/Template/Template.h
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/src/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/src/Template.cpp
Log:
Template : Adjusted cmake files for the package, fixed RTC.xml, converted to the UTF-8 character code and delete unnecessary file. refs #2704
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/CMakeLists.txt 2014-03-17 08:36:10 UTC (rev 130)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/CMakeLists.txt 2014-03-17 09:23:27 UTC (rev 131)
@@ -1,110 +1,122 @@
-cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+
+project(Template)
+string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
+include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
+set(PROJECT_VERSION 1.1.0 CACHE STRING "Template version")
+DISSECT_VERSION()
+set(PROJECT_DESCRIPTION "Template image component")
+set(PROJECT_VENDOR "AIST")
+set(PROJECT_AUTHOR "AIST")
+set(PROJECT_AUTHOR_SHORT "AIST")
+
+set(LINUX_PACKAGE_GENERATOR "DEB")
+#set(LINUX_PACKAGE_GENERATOR "RPM")
+set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
+set(PROJECT_TYPE "c++/opencv-rtcs")
-project(Template)
-string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
-include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.0.0 CACHE STRING "Template version")
-DISSECT_VERSION()
-set(PROJECT_DESCRIPTION "Template image component")
-set(PROJECT_VENDOR "AIST")
-set(PROJECT_AUTHOR "AIST")
-set(PROJECT_AUTHOR_SHORT "AIST")
-
-# Add an "uninstall" target
-CONFIGURE_FILE ("${PROJECT_SOURCE_DIR}/cmake/uninstall_target.cmake.in"
- "${PROJECT_BINARY_DIR}/uninstall_target.cmake" IMMEDIATE @ONLY)
+# Add an "uninstall" target
+CONFIGURE_FILE ("${PROJECT_SOURCE_DIR}/cmake/uninstall_target.cmake.in"
+ "${PROJECT_BINARY_DIR}/uninstall_target.cmake" IMMEDIATE @ONLY)
ADD_CUSTOM_TARGET (${PROJECT_NAME}_uninstall "${CMAKE_COMMAND}" -P
- "${PROJECT_BINARY_DIR}/uninstall_target.cmake")
+ "${PROJECT_BINARY_DIR}/uninstall_target.cmake")
+
+#option(BUILD_EXAMPLES "Build and install examples" OFF)
+option(BUILD_DOCUMENTATION "Build the documentation" OFF)
+#option(BUILD_TESTS "Build the tests" OFF)
+#option(BUILD_TOOLS "Build the tools" OFF)
+option(BUILD_IDL "Build and install idl" ON)
+option(BUILD_SOURCES "Build and install sources" OFF)
+
+option(STATIC_LIBS "Build static libraries" OFF)
+if(STATIC_LIBS)
+ set(LIB_TYPE STATIC)
+else(STATIC_LIBS)
+ set(LIB_TYPE SHARED)
+endif(STATIC_LIBS)
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ # Mac OS X specific code
+ SET(CMAKE_CXX_COMPILER "g++")
+endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+
+
+# Set up installation directories
+if(WIN32)
+# set(BIN_INSTALL_DIR "components/bin")
+# set(LIB_INSTALL_DIR "components/lib")
+ set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
+else(WIN32)
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
+endif(WIN32)
-#option(BUILD_EXAMPLES "Build and install examples" OFF)
-option(BUILD_DOCUMENTATION "Build the documentation" ON)
-#option(BUILD_TESTS "Build the tests" OFF)
-#option(BUILD_TOOLS "Build the tools" OFF)
-option(BUILD_IDL "Build and install idl" ON)
-option(BUILD_SOURCES "Build and install sources" OFF)
-
-option(STATIC_LIBS "Build static libraries" OFF)
-if(STATIC_LIBS)
- set(LIB_TYPE STATIC)
-else(STATIC_LIBS)
- set(LIB_TYPE SHARED)
-endif(STATIC_LIBS)
-
-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- # Mac OS X specific code
- SET(CMAKE_CXX_COMPILER "g++")
-endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-
-
-# Set up installation directories
-set(BIN_INSTALL_DIR "components/bin")
-set(LIB_INSTALL_DIR "components/lib")
-set(INC_INSTALL_DIR
- "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-set(SHARE_INSTALL_DIR
- "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-
-# Get necessary dependency information
-find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
-
-# Universal settings
-#enable_testing()
-
-# Subdirectories
-add_subdirectory(cmake)
-if(BUILD_DOCUMENTATION)
- add_subdirectory(doc)
-endif(BUILD_DOCUMENTATION)
-
-#if(BUILD_EXAMPLES)
-# add_subdirectory(examples)
-#endif(BUILD_EXAMPLES)
-
-if(BUILD_IDL)
- add_subdirectory(idl)
-endif(BUILD_IDL)
-
-add_subdirectory(include)
-MAP_ADD_STR(headers "include/" comp_hdrs)
-add_subdirectory(src)
-
-#if(BUILD_TESTS)
-# add_subdirectory(test)
-#endif(BUILD_TESTS)
-
-#if(BUILD_TOOLS)
-# add_subdirectory(tools)
-#endif(BUILD_TOOLS)
-
-if(BUILD_SOURCES)
- add_subdirectory(include)
- add_subdirectory(src)
-endif(BUILD_SOURCES)
-
-# Package creation
-# By default, do not warn when built on machines using only VS Express:
-IF(NOT DEFINED CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)
-SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
-ENDIF()
-include(InstallRequiredSystemLibraries)
-set(PROJECT_EXECUTABLES ${PROJECT_NAME_LOWER}Comp
- "${PROJECT_NAME_LOWER}Comp")
-
-set(cpack_options "${PROJECT_BINARY_DIR}/cpack_options.cmake")
-
-configure_file("${PROJECT_SOURCE_DIR}/cmake/cpack_options.cmake.in"
- ${cpack_options} @ONLY)
-
-set(CPACK_PROJECT_CONFIG_FILE ${cpack_options})
-include(${CPACK_PROJECT_CONFIG_FILE})
-include(CPack)
-
-
+#set(INC_INSTALL_DIR
+# "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+#set(SHARE_INSTALL_DIR
+# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+
+# Get necessary dependency information
+find_package(OpenRTM)
+if(${OpenRTM_FOUND})
+ MESSAGE(STATUS "OpenRTM configuration Found")
+else(${OpenRTM_FOUND})
+ message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
+ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
+ find_package(OpenRTM REQUIRED)
+endif(${OpenRTM_FOUND})
+
+# Universal settings
+#enable_testing()
+
+# Subdirectories
+add_subdirectory(cmake)
+if(BUILD_DOCUMENTATION)
+ add_subdirectory(doc)
+endif(BUILD_DOCUMENTATION)
+
+#if(BUILD_EXAMPLES)
+# add_subdirectory(examples)
+#endif(BUILD_EXAMPLES)
+
+if(BUILD_IDL)
+ add_subdirectory(idl)
+endif(BUILD_IDL)
+
+add_subdirectory(include)
+MAP_ADD_STR(headers "include/" comp_hdrs)
+add_subdirectory(src)
+
+#if(BUILD_TESTS)
+# add_subdirectory(test)
+#endif(BUILD_TESTS)
+
+#if(BUILD_TOOLS)
+# add_subdirectory(tools)
+#endif(BUILD_TOOLS)
+
+if(BUILD_SOURCES)
+ add_subdirectory(include)
+ add_subdirectory(src)
+endif(BUILD_SOURCES)
+
+# Package creation
+# By default, do not warn when built on machines using only VS Express:
+IF(NOT DEFINED CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)
+SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
+ENDIF()
+include(InstallRequiredSystemLibraries)
+set(PROJECT_EXECUTABLES ${PROJECT_NAME_LOWER}Comp
+ "${PROJECT_NAME_LOWER}Comp")
+
+set(cpack_options "${PROJECT_BINARY_DIR}/cpack_options.cmake")
+
+configure_file("${PROJECT_SOURCE_DIR}/cmake/cpack_options.cmake.in"
+ ${cpack_options} @ONLY)
+
+set(CPACK_PROJECT_CONFIG_FILE ${cpack_options})
+include(${CPACK_PROJECT_CONFIG_FILE})
+include(CPack)
+
+
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/README.Template
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/README.Template 2014-03-17 08:36:10 UTC (rev 130)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/README.Template 2014-03-17 09:23:27 UTC (rev 131)
@@ -1,162 +1,162 @@
-======================================================================
- RTComponent: Template specificatioin
-
- OpenRTM-aist-1.0.0
- Date: $Date$
-
- This file is generated by rtc-template with the following argments.
-
-# rtc-template -bcxx --module-name=Template
-# --module-desc='Template image component' --module-version=1.0.0 --module-vendor=AIST
-# --module-category=Category --module-comp-type=STATIC
-# --module-act-type=PERIODIC --module-max-inst=1
-# --config=image_path:char:""
-# --inport=original_image:RTC::CameraImage --outport=template:RTC::CameraImage --outport=picture:RTC::CameraImage
-
-
-======================================================================
- Basic Information
-======================================================================
-# <rtc-template block="module">
-Module Name: Template
-Description: Template image component
-Version: 1.0.0
-Vendor: AIST
-Category: Category
-Kind: DataFlowComponent
-Comp. Type: STATIC
-Act. Type: PERIODIC
-MAX Inst.: 1
-Lang: C++
-Lang Type:
-
-# </rtc-template>
-
-
-======================================================================
- Activity definition
-======================================================================
-
-[on_initialize] implemented
-
-[on_finalize]
-
-[on_startup]
-
-[on_shutdown]
-
-[on_activated] implemented
-
-[on_deactivated] implemented
-
-[on_execute] implemented
-
-[on_aborting]
-
-[on_error]
-
-[on_reset]
-
-[on_state_update]
-
-[on_rate_changed]
-
-======================================================================
- InPorts definition
-======================================================================
-# <rtc-template block="inport">
-
- Name: original_image
- PortNumber: 0
- Description:
- PortType:
- DataType: RTC::CameraImage
- MaxOut:
- [Data Elements]
- Name:
- Type:
- Number:
- Semantics:
- Unit:
- Frequency:
- Operation Cycle:
- RangeLow:
- RangeHigh:
- DefaultValue:
-
-
-# </rtc-template>
-
-======================================================================
- OutPorts definition
-======================================================================
-# <rtc-template block="outport">
-
- Name: template
- PortNumber: 0
- Description:
- PortType:
- DataType: RTC::CameraImage
- MaxOut:
- [Data Elements]
- Name:
- Type:
- Number:
- Semantics:
- Unit:
- Frequency:
- Operation Cycle:
- RangeLow:
- RangeHigh:
- DefaultValue:
-
- Name: picture
- PortNumber: 1
- Description:
- PortType:
- DataType: RTC::CameraImage
- MaxOut:
- [Data Elements]
- Name:
- Type:
- Number:
- Semantics:
- Unit:
- Frequency:
- Operation Cycle:
- RangeLow:
- RangeHigh:
- DefaultValue:
-
-
-# </rtc-template>
-
-
-======================================================================
- Service Port definition
-======================================================================
-# <rtc-template block="serviceport">
-# </rtc-template>
-
-======================================================================
- Configuration definition
-======================================================================
-# <rtc-template block="configuration">
- Configuration:
- Name: image_path
- Description:
- Type: char
- DefaultValue: ""
- Unit:
- Range:
- Constraint:
-
-# </rtc-template>
-
-This software is developed at the National Institute of Advanced
-Industrial Science and Technology. Approval number H23PRO-????. This
-software is licensed under the Lesser General Public License. See
-COPYING.LESSER.
-
-This area is reserved for future OpenRTM.
-
+======================================================================
+ RTComponent: Template specificatioin
+
+ OpenRTM-aist-1.0.0
+ Date: $Date$
+
+ This file is generated by rtc-template with the following argments.
+
+# rtc-template -bcxx --module-name=Template
+# --module-desc='Template image component' --module-version=1.1.0 --module-vendor=AIST
+# --module-category=Category --module-comp-type=STATIC
+# --module-act-type=PERIODIC --module-max-inst=1
+# --config=image_path:char:template.bmp
+# --inport=original_image:RTC::CameraImage --outport=template:RTC::CameraImage --outport=picture:RTC::CameraImage
+
+
+======================================================================
+ Basic Information
+======================================================================
+# <rtc-template block="module">
+Module Name: Template
+Description: Template image component
+Version: 1.1.0
+Vendor: AIST
+Category: Category
+Kind: DataFlowComponent
+Comp. Type: STATIC
+Act. Type: PERIODIC
+MAX Inst.: 1
+Lang: C++
+Lang Type:
+
+# </rtc-template>
+
+
+======================================================================
+ Activity definition
+======================================================================
+
+[on_initialize] implemented
+
+[on_finalize]
+
+[on_startup]
+
+[on_shutdown]
+
+[on_activated] implemented
+
+[on_deactivated] implemented
+
+[on_execute] implemented
+
+[on_aborting]
+
+[on_error]
+
+[on_reset]
+
+[on_state_update]
+
+[on_rate_changed]
+
+======================================================================
+ InPorts definition
+======================================================================
+# <rtc-template block="inport">
+
+ Name: original_image
+ PortNumber: 0
+ Description:
+ PortType:
+ DataType: RTC::CameraImage
+ MaxOut:
+ [Data Elements]
+ Name:
+ Type:
+ Number:
+ Semantics:
+ Unit:
+ Frequency:
+ Operation Cycle:
+ RangeLow:
+ RangeHigh:
+ DefaultValue:
+
+
+# </rtc-template>
+
+======================================================================
+ OutPorts definition
+======================================================================
+# <rtc-template block="outport">
+
+ Name: template
+ PortNumber: 0
+ Description:
+ PortType:
+ DataType: RTC::CameraImage
+ MaxOut:
+ [Data Elements]
+ Name:
+ Type:
+ Number:
+ Semantics:
+ Unit:
+ Frequency:
+ Operation Cycle:
+ RangeLow:
+ RangeHigh:
+ DefaultValue:
+
+ Name: picture
+ PortNumber: 1
+ Description:
+ PortType:
+ DataType: RTC::CameraImage
+ MaxOut:
+ [Data Elements]
+ Name:
+ Type:
+ Number:
+ Semantics:
+ Unit:
+ Frequency:
+ Operation Cycle:
+ RangeLow:
+ RangeHigh:
+ DefaultValue:
+
+
+# </rtc-template>
+
+
+======================================================================
+ Service Port definition
+======================================================================
+# <rtc-template block="serviceport">
+# </rtc-template>
+
+======================================================================
+ Configuration definition
+======================================================================
+# <rtc-template block="configuration">
+ Configuration:
+ Name: image_path
+ Description:
+ Type: char
+ DefaultValue: template.bmp
+ Unit:
+ Range:
+ Constraint:
+
+# </rtc-template>
+
+This software is developed at the National Institute of Advanced
+Industrial Science and Technology. Approval number H23PRO-????. This
+software is licensed under the Lesser General Public License. See
+COPYING.LESSER.
+
+This area is reserved for future OpenRTM.
+
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/RTC.xml
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/RTC.xml 2014-03-17 08:36:10 UTC (rev 130)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/RTC.xml 2014-03-17 09:23:27 UTC (rev 131)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Template:1.0.0" xmlns:rtcExt="http://www.openrtp.org/namespaces/rtc_ext" xmlns:rtcDoc="http://www.openrtp.org/namespaces/rtc_doc" xmlns:rtc="http://www.openrtp.org/namespaces/rtc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <rtc:BasicInfo xsi:type="rtcExt:basic_info_ext" rtcExt:saveProject="Template" rtc:updateDate="2013-06-13T09:41:43+09:00" rtc:creationDate="2013-06-13T09:41:43+09:00" rtc:version="1.0.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Template image component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Template"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Template:1.1.0" xmlns:rtcExt="http://www.openrtp.org/namespaces/rtc_ext" xmlns:rtcDoc="http://www.openrtp.org/namespaces/rtc_doc" xmlns:rtc="http://www.openrtp.org/namespaces/rtc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <rtc:BasicInfo xsi:type="rtcExt:basic_info_ext" rtcExt:saveProject="Template" rtc:updateDate="2013-06-13T09:41:43+09:00" rtc:creationDate="2013-06-13T09:41:43+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Template image component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Template"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
@@ -18,7 +18,7 @@
<rtc:OnModeChanged xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
</rtc:Actions>
<rtc:ConfigurationSet>
- <rtc:Configuration xsi:type="rtcExt:configuration_ext" rtcExt:variableName="img_path" rtc:unit="" rtc:defaultValue="""" rtc:type="char" rtc:name="image_path">
+ <rtc:Configuration xsi:type="rtcExt:configuration_ext" rtcExt:variableName="img_path" rtc:unit="" rtc:defaultValue="template.bmp" rtc:type="char" rtc:name="image_path">
<rtc:Constraint>
<rtc:ConstraintUnitType>
<rtc:propertyIsEqualTo rtc:matchCase="false">
Deleted: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/RTC.xml20130613094913
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/RTC.xml20130613094913 2014-03-17 08:36:10 UTC (rev 130)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/RTC.xml20130613094913 2014-03-17 09:23:27 UTC (rev 131)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:VenderName:Category:ModuleName:1.0.0" xmlns:rtcExt="http://www.openrtp.org/namespaces/rtc_ext" xmlns:rtcDoc="http://www.openrtp.org/namespaces/rtc_doc" xmlns:rtc="http://www.openrtp.org/namespaces/rtc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <rtc:BasicInfo xsi:type="rtcExt:basic_info_ext" rtc:updateDate="2013-06-13T09:41:43+09:00" rtc:creationDate="2013-06-13T09:41:43+09:00" rtc:version="1.0.0" rtc:vendor="VenderName" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="ModuleDescription" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="ModuleName">
- <rtcDoc:Doc rtcDoc:license="" rtcDoc:creator=""/>
- </rtc:BasicInfo>
- <rtc:Actions/>
-</rtc:RtcProfile>
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/cmake/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/cmake/CMakeLists.txt 2014-03-17 08:36:10 UTC (rev 130)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/cmake/CMakeLists.txt 2014-03-17 09:23:27 UTC (rev 131)
@@ -2,8 +2,8 @@
set(PKG_LIBS -l${PROJECT_NAME_LOWER})
set(pkg_conf_file ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME_LOWER}.pc)
configure_file(${PROJECT_NAME_LOWER}.pc.in ${pkg_conf_file} @ONLY)
-install(FILES ${pkg_conf_file}
- DESTINATION ${LIB_INSTALL_DIR}/pkgconfig/ COMPONENT component)
+#install(FILES ${pkg_conf_file}
+# DESTINATION ${LIB_INSTALL_DIR}/pkgconfig/ COMPONENT component)
# Install CMake modules
set(cmake_config ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config.cmake)
@@ -14,5 +14,5 @@
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME_LOWER}-config-version.cmake.in
${cmake_version_config} @ONLY)
set(cmake_mods ${cmake_config} ${cmake_version_config})
-install(FILES ${cmake_mods} DESTINATION ${SHARE_INSTALL_DIR} COMPONENT library)
+#install(FILES ${cmake_mods} DESTINATION ${SHARE_INSTALL_DIR} COMPONENT library)
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/cmake/cpack_options.cmake.in
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/cmake/cpack_options.cmake.in 2014-03-17 08:36:10 UTC (rev 130)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/cmake/cpack_options.cmake.in 2014-03-17 09:23:27 UTC (rev 131)
@@ -68,9 +68,9 @@
#
#
#
- set(CPACK_NSIS_MUI_ICON "@PROJECT_SOURCE_DIR@/cmake\\rt_middleware_logo.ico")
- set(CPACK_NSIS_MUI_UNIICON "@PROJECT_SOURCE_DIR@/cmake\\rt_middleware_logo.ico")
- set(CPACK_PACKAGE_ICON "@PROJECT_SOURCE_DIR@/cmake\\rt_middleware_logo.bmp")
+# set(CPACK_NSIS_MUI_ICON "@PROJECT_SOURCE_DIR@/cmake\\rt_middleware_logo.ico")
+# set(CPACK_NSIS_MUI_UNIICON "@PROJECT_SOURCE_DIR@/cmake\\rt_middleware_logo.ico")
+# set(CPACK_PACKAGE_ICON "@PROJECT_SOURCE_DIR@/cmake\\rt_middleware_logo.bmp")
set(CPACK_NSIS_HELP_LINK "http://www.openrtm.org")
set(CPACK_NSIS_URL_INFO_ABOUT "http://www.openrtm.org")
set(CPACK_NSIS_MODIFY_PATH ON)
@@ -90,5 +90,9 @@
set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS
" Delete \"$INSTDIR\\@PROJECT_NAME_LOWER at -config.cmake\"
Delete \"$INSTDIR\\@PROJECT_NAME_LOWER at -config-version.cmake\"")
+
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
ENDIF (WIN32)
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/cmake/wix.xsl.in
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/cmake/wix.xsl.in 2014-03-17 08:36:10 UTC (rev 130)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/cmake/wix.xsl.in 2014-03-17 09:23:27 UTC (rev 131)
@@ -1,99 +1,99 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:wix="http://schemas.microsoft.com/wix/2006/wi">
- <xsl:output indent="yes" method="xml"/>
-
- <xsl:template match="/wix:Wix">
- <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Product xmlns="http://schemas.microsoft.com/wix/2006/wi" Id="333ABABD-BF10-4A0B-A65E-33A82D701F8F" Name="@CPACK_PACKAGE_NAME@ @CPACK_PACKAGE_VERSION@" Language="1041" Codepage="932" Version="@CPACK_PACKAGE_VERSION@" Manufacturer="@CPACK_PACKAGE_VENDOR@" UpgradeCode="F2BE8A8A-33CD-4061-8B9C-B03C4C4D41B9">
- <Package InstallerVersion="300" Compressed="yes" Languages='1041' SummaryCodepage='932' />
- <Media Id="1" Cabinet="@CPACK_PACKAGE_NAME at .cab" EmbedCab="yes" />
- <Directory Id="TARGETDIR" Name="SourceDir" >
- <Directory Id="ProgramFilesFolder" Name="PFILE" >
- <Directory Id="OPENRTM_DIR" Name="OpenRTM-aist" >
- <!-- <Directory Id="INSTALLLOCATION" Name="@OPENRTM_VERSION_MAJOR at .@OPENRTM_VERSION_MINOR@" /> -->
- <Directory Id="INSTALLLOCATION" Name="1.1" />
- </Directory>
- </Directory>
- </Directory>
-
- <Feature Id="APPLICATIONS" Title="@CPACK_COMPONENT_COMPONENT_DISPLAY_NAME@" Level="1" Description="@CPACK_COMPONENT_COMPONENT_DESCRIPTION@" >
- <!-- Start Ripping through the xml -->
- <!--
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\@RTC_NAME at .dll')]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\@RTC_NAME at .lib')]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\@RTC_NAME at Comp.exe')]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\RTC.xml')]" />
- -->
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, translate('\bin\@CPACK_PACKAGE_NAME at .dll','ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz'))]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, translate('\lib\@CPACK_PACKAGE_NAME at .lib','ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz'))]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, translate('\bin\@CPACK_PACKAGE_NAME at Comp.exe','ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz'))]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, 'RTC.xml')]" />
- </Feature>
-
- <Feature Id="DOCUMENTS" Title="@CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME@" Level="1" Absent="allow" Description="@CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION@" >
- <!-- Start Ripping through the xml -->
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\doc')]" />
- </Feature>
-
- <!-- <Feature Id="SOURCES" Title="@CPACK_COMPONENT_SOURCES_DISPLAY_NAME@" Level="1" Absent="allow" Description="@CPACK_COMPONENT_SOURCES_DESCRIPTION@" >-->
- <!-- Start Ripping through the xml -->
- <!-- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@CPACK_PACKAGE_INSTALL_DIRECTORY@\src')]" /> -->
- <!-- </Feature> -->
-
- <!--Tack on your specific wix options-->
- <UIRef Id="WixUI_FeatureTree" />
- <UIRef Id="WixUI_ErrorProgressText" />
- <!--
- <WixVariable Id="WixUILicenseRtf" Value="@CPACK_RESOURCE_FILE_LICENSE@"/>
- -->
- <!-- TODO: Add Wix Specific Dialogs and features. -->
- <!-- TODO: Add artwork -->
- <!-- TODO: Add ... -->
-
- </Product>
-
- <!--Output the fragment info which heat generates-->
- <xsl:copy-of select="wix:Fragment[wix:DirectoryRef/wix:Component]" />
- <xsl:apply-templates select="wix:Fragment[wix:DirectoryRef/@Id!='TARGETDIR' and wix:DirectoryRef/wix:Directory]" />
-
- </Wix>
- </xsl:template>
-
- <xsl:template match="wix:Fragment[wix:DirectoryRef/wix:Directory]" >
- <xsl:copy>
- <xsl:apply-templates select="wix:DirectoryRef" />
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="wix:DirectoryRef" >
- <xsl:copy>
- <xsl:choose>
- <xsl:when test="wix:Directory[@Name='components']" >
- <xsl:attribute name="Id">INSTALLLOCATION</xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute name="Id"><xsl:value-of select="@Id" /></xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:apply-templates />
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="wix:Directory" >
- <xsl:copy>
- <xsl:attribute name="Id"><xsl:value-of select="@Id" /></xsl:attribute>
- <xsl:attribute name="Name"><xsl:value-of select="@Name" /></xsl:attribute>
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="wix:Component">
- <xsl:element name="ComponentRef" xmlns="http://schemas.microsoft.com/wix/2006/wi" >
- <xsl:attribute name="Id">
- <xsl:value-of select="@Id" />
- </xsl:attribute>
- </xsl:element>
- </xsl:template>
-
-</xsl:stylesheet>
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:wix="http://schemas.microsoft.com/wix/2006/wi">
+ <xsl:output indent="yes" method="xml"/>
+
+ <xsl:template match="/wix:Wix">
+ <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <Product xmlns="http://schemas.microsoft.com/wix/2006/wi" Id="90AEAA2D-7FE5-4C45-BEB9-EF93878DE68D" Name="@CPACK_PACKAGE_NAME@ @CPACK_PACKAGE_VERSION@" Language="1041" Codepage="932" Version="@CPACK_PACKAGE_VERSION@" Manufacturer="@CPACK_PACKAGE_VENDOR@" UpgradeCode="9E695E45-0186-40D0-9AED-77B95B883B94">
+ <Package InstallerVersion="300" Compressed="yes" Languages='1041' SummaryCodepage='932' />
+ <Media Id="1" Cabinet="@CPACK_PACKAGE_NAME at .cab" EmbedCab="yes" />
+ <Directory Id="TARGETDIR" Name="SourceDir" >
+ <Directory Id="ProgramFilesFolder" Name="PFILE" >
+ <Directory Id="OPENRTM_DIR" Name="OpenRTM-aist" >
+ <!-- <Directory Id="INSTALLLOCATION" Name="@OPENRTM_VERSION_MAJOR at .@OPENRTM_VERSION_MINOR@" /> -->
+ <Directory Id="INSTALLLOCATION" Name="1.1" />
+ </Directory>
+ </Directory>
+ </Directory>
+
+ <Feature Id="APPLICATIONS" Title="@CPACK_COMPONENT_COMPONENT_DISPLAY_NAME@" Level="1" Description="@CPACK_COMPONENT_COMPONENT_DESCRIPTION@" >
+ <!-- Start Ripping through the xml -->
+ <!--
+ <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\@RTC_NAME at .dll')]" />
+ <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\@RTC_NAME at .lib')]" />
+ <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\@RTC_NAME at Comp.exe')]" />
+ <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\RTC.xml')]" />
+ -->
+ <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, translate('\bin\@CPACK_PACKAGE_NAME at .dll','ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz'))]" />
+ <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, translate('\lib\@CPACK_PACKAGE_NAME at .lib','ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz'))]" />
+ <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, translate('\bin\@CPACK_PACKAGE_NAME at Comp.exe','ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz'))]" />
+ <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, 'RTC.xml')]" />
+ </Feature>
+
+ <Feature Id="DOCUMENTS" Title="@CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME@" Level="1" Absent="allow" Description="@CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION@" >
+ <!-- Start Ripping through the xml -->
+ <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\doc')]" />
+ </Feature>
+
+ <!-- <Feature Id="SOURCES" Title="@CPACK_COMPONENT_SOURCES_DISPLAY_NAME@" Level="1" Absent="allow" Description="@CPACK_COMPONENT_SOURCES_DESCRIPTION@" >-->
+ <!-- Start Ripping through the xml -->
+ <!-- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@CPACK_PACKAGE_INSTALL_DIRECTORY@\src')]" /> -->
+ <!-- </Feature> -->
+
+ <!--Tack on your specific wix options-->
+ <UIRef Id="WixUI_FeatureTree" />
+ <UIRef Id="WixUI_ErrorProgressText" />
+ <!--
+ <WixVariable Id="WixUILicenseRtf" Value="@CPACK_RESOURCE_FILE_LICENSE@"/>
+ -->
+ <!-- TODO: Add Wix Specific Dialogs and features. -->
+ <!-- TODO: Add artwork -->
+ <!-- TODO: Add ... -->
+
+ </Product>
+
+ <!--Output the fragment info which heat generates-->
+ <xsl:copy-of select="wix:Fragment[wix:DirectoryRef/wix:Component]" />
+ <xsl:apply-templates select="wix:Fragment[wix:DirectoryRef/@Id!='TARGETDIR' and wix:DirectoryRef/wix:Directory]" />
+
+ </Wix>
+ </xsl:template>
+
+ <xsl:template match="wix:Fragment[wix:DirectoryRef/wix:Directory]" >
+ <xsl:copy>
+ <xsl:apply-templates select="wix:DirectoryRef" />
+ </xsl:copy>
+ </xsl:template>
+
+ <xsl:template match="wix:DirectoryRef" >
+ <xsl:copy>
+ <xsl:choose>
+ <xsl:when test="wix:Directory[@Name='components']" >
+ <xsl:attribute name="Id">INSTALLLOCATION</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute name="Id"><xsl:value-of select="@Id" /></xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:apply-templates />
+ </xsl:copy>
+ </xsl:template>
+
+ <xsl:template match="wix:Directory" >
+ <xsl:copy>
+ <xsl:attribute name="Id"><xsl:value-of select="@Id" /></xsl:attribute>
+ <xsl:attribute name="Name"><xsl:value-of select="@Name" /></xsl:attribute>
+ </xsl:copy>
+ </xsl:template>
+
+ <xsl:template match="wix:Component">
+ <xsl:element name="ComponentRef" xmlns="http://schemas.microsoft.com/wix/2006/wi" >
+ <xsl:attribute name="Id">
+ <xsl:value-of select="@Id" />
+ </xsl:attribute>
+ </xsl:element>
+ </xsl:template>
+
+</xsl:stylesheet>
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/doc/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/doc/CMakeLists.txt 2014-03-17 08:36:10 UTC (rev 130)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/doc/CMakeLists.txt 2014-03-17 09:23:27 UTC (rev 131)
@@ -1,40 +1,40 @@
cmake_policy(SET CMP0002 OLD)
-find_package(Doxygen)
-if(DOXYGEN_FOUND)
- # Search for Sphinx
- #set(SPHINX_PATH "" CACHE PATH
- # "Path to the directory containing the sphinx-build program")
- #find_program(SPHINX_BUILD sphinx-build PATHS ${SPHINX_PATH})
- #if(NOT SPHINX_BUILD)
- # message(FATAL_ERROR
- # "Sphinx was not found. Set SPHINX_PATH to the directory containing the sphinx-build executable, or disable BUILD_DOCUMENTATION.")
- #endif(NOT SPHINX_BUILD)
-
- set(html_dir "${CMAKE_CURRENT_BINARY_DIR}/html")
- set(doxygen_dir "${html_dir}/doxygen")
- file(MAKE_DIRECTORY ${html_dir})
- file(MAKE_DIRECTORY ${doxygen_dir})
-
- # Doxygen part
- set(doxyfile "${CMAKE_CURRENT_BINARY_DIR}/doxyfile")
- configure_file(doxyfile.in ${doxyfile})
+find_package(Doxygen)
+if(DOXYGEN_FOUND)
+ # Search for Sphinx
+ #set(SPHINX_PATH "" CACHE PATH
+ # "Path to the directory containing the sphinx-build program")
+ #find_program(SPHINX_BUILD sphinx-build PATHS ${SPHINX_PATH})
+ #if(NOT SPHINX_BUILD)
+ # message(FATAL_ERROR
+ # "Sphinx was not found. Set SPHINX_PATH to the directory containing the sphinx-build executable, or disable BUILD_DOCUMENTATION.")
+ #endif(NOT SPHINX_BUILD)
+
+ set(html_dir "${CMAKE_CURRENT_BINARY_DIR}/html")
+ set(doxygen_dir "${html_dir}/doxygen")
+ file(MAKE_DIRECTORY ${html_dir})
+ file(MAKE_DIRECTORY ${doxygen_dir})
+
+ # Doxygen part
+ set(doxyfile "${CMAKE_CURRENT_BINARY_DIR}/doxyfile")
+ configure_file(doxyfile.in ${doxyfile})
add_custom_target(${PROJECT_NAME}_doxygen_doc ${DOXYGEN_EXECUTABLE} ${doxyfile})
-
- # Sphinx part
- #set(conf_dir "${CMAKE_CURRENT_BINARY_DIR}/conf")
- #file(MAKE_DIRECTORY "${conf_dir}")
- #file(MAKE_DIRECTORY "${conf_dir}/_static")
- #set(conf_py "${conf_dir}/conf.py")
- #configure_file(conf.py.in ${conf_py})
- #add_custom_target(sphinx_doc ALL sphinx-build -b html -c ${conf_dir}
- # ${CMAKE_CURRENT_SOURCE_DIR}/content ${CMAKE_CURRENT_BINARY_DIR}/html
- # DEPENDS doxygen_doc)
- #install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html" DESTINATION
- # "components/share/doc/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}"
- # COMPONENT documentation)
-else(DOXYGEN_FOUND)
- message(FATAL_ERROR
- "Doxygen was not found. Cannot build documentation. Disable BUILD_DOCUMENTATION to continue")
-endif(DOXYGEN_FOUND)
-
+
+ # Sphinx part
+ #set(conf_dir "${CMAKE_CURRENT_BINARY_DIR}/conf")
+ #file(MAKE_DIRECTORY "${conf_dir}")
+ #file(MAKE_DIRECTORY "${conf_dir}/_static")
+ #set(conf_py "${conf_dir}/conf.py")
+ #configure_file(conf.py.in ${conf_py})
+ #add_custom_target(sphinx_doc ALL sphinx-build -b html -c ${conf_dir}
+ # ${CMAKE_CURRENT_SOURCE_DIR}/content ${CMAKE_CURRENT_BINARY_DIR}/html
+ # DEPENDS doxygen_doc)
+ #install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html" DESTINATION
+ # "components/share/doc/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}"
+ # COMPONENT documentation)
+else(DOXYGEN_FOUND)
+ message(FATAL_ERROR
+ "Doxygen was not found. Cannot build documentation. Disable BUILD_DOCUMENTATION to continue")
+endif(DOXYGEN_FOUND)
+
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/doc/content/index.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/doc/content/index.txt 2014-03-17 08:36:10 UTC (rev 130)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/doc/content/index.txt 2014-03-17 09:23:27 UTC (rev 131)
@@ -1,143 +1,143 @@
-TemplateName - English
-========================
-
-.. toctree::
- :hidden:
-
- index_j
-
-
-Introduction
-============
-
-
-For a full list of classes and functions, see the `API documentation`_.
-
-.. _`API Documentation`:
- doxygen/html/index.html
-
-Requirements
-============
-
-Template uses the `CMake build system`. You will need at least version
-2.8 to be able to build the component.
-
-.. _`CMAke build system`:
- http://www.cmake.org
-
-
-Installation
-============
-
-Binary
-------
-
-Users of Windows can install the component using the binary installer. This
-will install the component and all its necessary dependencies. It is the
-recommended method of installation in Windows.
-
-- Download the installer from the website.
-- Double-click the executable file to begin installation.
-- Follow the instructions to install the component.
-- You may need to restart your computer for environment variable changes
- to take effect before using the component.
-
-The component can be launched by double-clicking the
-``TemplateComp`` executable. The ``Template`` library
-is available for loading into a manager, using the initialisation function
-``TemplateInit``.
-
-From source
------------
-
-Follow these steps to install Template from source in any operating
-system:
-
-- Download the source, either from the repository or a source archive,
- and extract it somewhere::
-
- tar -xvzf Template-1.0.0.tar.gz
-
-- Change to the directory containing the extracted source::
-
- cd Template-1.0.0
-
-- Create a directory called ``build``::
-
- mkdir build
-
-- Change to that directory::
-
- cd build
-
-- Run cmake or cmake-gui::
-
- cmake ../
-
-- If no errors occurred, run make::
-
- make
-
-- Finally, install the component. Ensure the necessary permissions to
- install into the chosen prefix are available::
-
- make install
-
-- The install destination can be changed by executing ccmake and changing
- the variable ``CMAKE_INSTALL_PREFIX``::
-
- ccmake ../
-
-The component is now ready for use. See the next section for instructions on
-configuring the component.
-
-Template can be launched in stand-alone mode by executing the
-``TemplateComp`` executable (installed into ``${prefix}/components/bin``).
-Alternatively, ``libTemplate.so`` can be loaded into a manager, using the
-initialisation function ``TemplateInit``. This shared object can be found in
-``${prefix}/components/lib`` or ``${prefix}/components/lib64``.
-
-
-Configuration
-=============
-
-The available configuration parameters are described below:
-
-================ ================== ================ ======
-Parameter Data type Default Value Effect
-================ ================== ================ ======
-image_path char ""
-================ ================== ================ ======
-
-Ports
-=====
-
-The ports provided by the component are described below:
-
-=============== =========== ============================== =======
-Name Type Data type Purpose
-=============== =========== ============================== =======
-original_image InPort RTC::CameraImage
-template OutPort RTC::CameraImage
-picture OutPort RTC::CameraImage
-=============== =========== ============================== =======
-
-Examples
-========
-
-An example configuration file is provided in the
-``${prefix}/components/share/Template/examples/conf/`` directory.
-
-Changelog
-=========
-
-
-
-License
-=======
-
-This software is developed at the National Institute of Advanced
-Industrial Science and Technology. Approval number H23PRO-????. This
-software is licensed under the Lesser General Public License. See
-COPYING.LESSER.
-
+TemplateName - English
+========================
+
+.. toctree::
+ :hidden:
+
+ index_j
+
+
+Introduction
+============
+
+
+For a full list of classes and functions, see the `API documentation`_.
+
+.. _`API Documentation`:
+ doxygen/html/index.html
+
+Requirements
+============
+
+Template uses the `CMake build system`. You will need at least version
+2.8 to be able to build the component.
+
+.. _`CMAke build system`:
+ http://www.cmake.org
+
+
+Installation
+============
+
+Binary
+------
+
+Users of Windows can install the component using the binary installer. This
+will install the component and all its necessary dependencies. It is the
+recommended method of installation in Windows.
+
+- Download the installer from the website.
+- Double-click the executable file to begin installation.
+- Follow the instructions to install the component.
+- You may need to restart your computer for environment variable changes
+ to take effect before using the component.
+
+The component can be launched by double-clicking the
+``TemplateComp`` executable. The ``Template`` library
+is available for loading into a manager, using the initialisation function
+``TemplateInit``.
+
+From source
+-----------
+
+Follow these steps to install Template from source in any operating
+system:
+
+- Download the source, either from the repository or a source archive,
+ and extract it somewhere::
+
+ tar -xvzf Template-1.0.0.tar.gz
+
+- Change to the directory containing the extracted source::
+
+ cd Template-1.0.0
+
+- Create a directory called ``build``::
+
+ mkdir build
+
+- Change to that directory::
+
+ cd build
+
+- Run cmake or cmake-gui::
+
+ cmake ../
+
+- If no errors occurred, run make::
+
+ make
+
+- Finally, install the component. Ensure the necessary permissions to
+ install into the chosen prefix are available::
+
+ make install
+
+- The install destination can be changed by executing ccmake and changing
+ the variable ``CMAKE_INSTALL_PREFIX``::
+
+ ccmake ../
+
+The component is now ready for use. See the next section for instructions on
+configuring the component.
+
+Template can be launched in stand-alone mode by executing the
+``TemplateComp`` executable (installed into ``${prefix}/components/bin``).
+Alternatively, ``libTemplate.so`` can be loaded into a manager, using the
+initialisation function ``TemplateInit``. This shared object can be found in
+``${prefix}/components/lib`` or ``${prefix}/components/lib64``.
+
+
+Configuration
+=============
+
+The available configuration parameters are described below:
+
+================ ================== ================ ======
+Parameter Data type Default Value Effect
+================ ================== ================ ======
+image_path char template.bmp
+================ ================== ================ ======
+
+Ports
+=====
+
+The ports provided by the component are described below:
+
+=============== =========== ============================== =======
+Name Type Data type Purpose
+=============== =========== ============================== =======
+original_image InPort RTC::CameraImage
+template OutPort RTC::CameraImage
+picture OutPort RTC::CameraImage
+=============== =========== ============================== =======
+
+Examples
+========
+
+An example configuration file is provided in the
+``${prefix}/components/share/Template/examples/conf/`` directory.
+
+Changelog
+=========
+
+
+
+License
+=======
+
+This software is developed at the National Institute of Advanced
+Industrial Science and Technology. Approval number H23PRO-????. This
+software is licensed under the Lesser General Public License. See
+COPYING.LESSER.
+
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/doc/content/index_j.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/doc/content/index_j.txt 2014-03-17 08:36:10 UTC (rev 130)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/doc/content/index_j.txt 2014-03-17 09:23:27 UTC (rev 131)
@@ -1,133 +1,133 @@
-Template - 日本語
-=======================
-
-
-ã¯ã˜ã‚ã«
-========
-
-クラスã«ã¤ã„ã¦ã¯ã€ `APIドã‚ュメンテーション`_ ã«å‚ç…§ã—ã¦ãã ã•ã„。
-
-.. _`APIドã‚ュメンテーション`:
- doxygen/html/index.html
-
-æ¡ä»¶
-====
-
-Templateã¯OpenRTM-aist 1.0.0以上ã®C++版ãŒå¿…è¦ã§ã™ã€‚
-
-Template㯠CMake_ を使ã„ã¾ã™ã€‚CMake 2.8以上ãŒå¿…è¦ã§ã™ã€‚
-
-.. _CMAke:
- http://www.cmake.org
-
-インストール
-============
-
-インストーラ
-------------
-
-Windowsã®ãƒ¦ãƒ¼ã‚¶ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ãƒ‘ッケージを使用ã—ã¦ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’インストール
-ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã“ã‚Œã¯ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆåŠã³ãã®ã™ã¹ã¦ã®å¿…è¦ãªãƒ©ã‚¤ãƒ–ラリを
-インストールã—ã¾ã™ã€‚Windowsã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹å ´åˆã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ã®ä½¿ç”¨ã‚’推奨ã—ã¦ã¾ã™ã€‚
-
-- インストーラをダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã•ã„。
-- インストールを始ã‚ã‚‹ãŸã‚ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ã‚’ダブルクリックã—ã¦ãã ã•ã„。
-- 指示ã«ã—ãŸãŒã£ã¦ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’インストールã—ã¦ãã ã•ã„。
-- 環境変数ã®å¤‰æ›´ã‚’é©ç”¨ã™ã‚‹ãŸã‚ã€ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’使用ã™ã‚‹å‰ã«ã‚³ãƒ³ãƒ”ューターを
- å†èµ·å‹•ã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。
-
-Template㯠``TemplateComp`` ã®å®Ÿè¡Œã‚’ダブルクリックã—ã¦å®Ÿè¡Œã™ã‚‹ã“ã¨ãŒ
-ã§ãã¾ã™ã€‚ã‚ã‚‹ã„ã¯ã€ ``Template`` ã‚’åˆæœŸåŒ–関数㮠``TemplateInit`` を利用ã—ã¦ã€
-マãƒãƒ¼ã‚¸ãƒ£ã«ãƒãƒ¼ãƒ‰ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
-
-ソースã‹ã‚‰
-----------
-
-ソースを使ã†å ´åˆã¯ä»¥ä¸‹ã®æ‰‹é †ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•ã„。
-
-- ソースをダウンãƒãƒ¼ãƒ‰ã—ã¦è§£å‡ã—ã¦ãã ã•ã„::
-
- tar -xvzf Template-1.0.0.tar.gz
-
-- 解å‡ã•ã‚ŒãŸãƒ•ã‚©ãƒ«ãƒ€ã«å…¥ã£ã¦ãã ã•ã„::
-
- cd Template-1.0.0
-
-- ``build`` フォルダを作ã£ã¦ãã ã•ã„::
-
- mkdir build
-
-- `` build`` フォルダã«å…¥ã£ã¦ãã ã•ã„::
-
- cd build
-
-- CMakeを実行ã—ã¦ãã ã•ã„::
-
- cmake ../
-
-- エラーãŒå‡ºç„¡ã„å ´åˆã€makeを実行ã—ã¦ãã ã•ã„::
-
- make
-
-- ``make install`` ã§ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’インストールã—ã¦ãã ã•ã„。é¸æŠžã•ã‚ŒãŸ
- ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å ´æ‰€ã«æ›¸ãè¾¼ã¿æ¨©é™ãŒã‚ã‚‹ã‹ã‚’確èªã—ã¦ãã ã•ã„::
-
- ``make install``
-
-- インストールã™ã‚‹å ´æ‰€ã¯ccmakeを実行ã—㦠``CMAKE_INSTALL_PREFIX`` ã‚’
- è¨å®šã™ã‚‹ã“ã¨ã§å¤‰æ›´ãŒå¯èƒ½ã§ã™ã€‚
-
- ccmake ../
-
-ã“ã“ã¾ã§ã§ã€ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆãŒä½¿ãˆã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã—ãŸã€‚コンフィグレーションã¯æ¬¡ã®ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã‚’
-å‚ç…§ã—ã¦ãã ã•ã„。
-
-Template㯠``TemplateComp`` を実行（ ``${prefix}/components/bin`` ã«
-インストールã•ã‚Œã¾ã™ï¼‰ã™ã‚‹ã“ã¨ã§ã‚¹ã‚¿ãƒ³ãƒ‰ã‚¢ãƒãƒ¼ãƒ³ãƒ¢ãƒ¼ãƒ‰ã§å®Ÿè¡Œã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
-ã‚ã‚‹ã„ã¯ã€ ``libTemplate.so`` ã‚’åˆæœŸåŒ–関数㮠``TemplateInit`` を利用ã—ã¦ã€
-マãƒãƒ¼ã‚¸ãƒ£ã«ãƒãƒ¼ãƒ‰ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã“ã®ãƒ©ã‚¤ãƒ–ラリ㯠``${prefix}/components/lib``
-ã¾ãŸã¯ ``${prefix}/components/lib64`` ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™ã€‚
-
-
-コンフィグレーション
-====================
-
-使ãˆã‚‹ã‚³ãƒ³ãƒ•ã‚£ã‚°ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ãƒ‘ラメータã¯ä»¥ä¸‹ã®ãƒ†ãƒ¼ãƒ–ルをå‚ç…§
-ã—ã¦ãã ã•ã„。
-
-================ ================== ================ ====
-パラメータ データ型 デフォルト値 æ„味
-================ ================== ================ ====
-image_path char ""
-================ ================== ================ ====
-
-ãƒãƒ¼ãƒˆ
-======
-
-コンãƒãƒ¼ãƒãƒ³ãƒˆã«ã‚ˆã£ã¦æä¾›ã•ã‚Œã‚‹ãƒãƒ¼ãƒˆã¯ä»¥ä¸‹ã®ãƒ†ãƒ¼ãƒ–ルã§è¿°ã¹ã‚‰ã‚Œã¦ã„ã¾ã™ã€‚
-
-=============== =========== ============================== ====
-ãƒãƒ¼ãƒˆå ãƒãƒ¼ãƒˆåž‹ データ型 æ„味
-=============== =========== ============================== ====
-original_image InPort RTC::CameraImage
-template OutPort RTC::CameraImage
-picture OutPort RTC::CameraImage
-=============== =========== ============================== ====
-
-例
-==
-
-例ã®rtc.confファイル㯠``${prefix}/components/share/Template/examples/conf/``
-フォルダã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™ã€‚
-
-Changelog
-=========
-
-
-License
-=======
-
-ã“ã®ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¯ç”£æ¥æŠ€è¡“ç·åˆç ”究所ã§é–‹ç™ºã•ã‚Œã¦ã„ã¾ã™ã€‚承èªç•ªå·ã¯H23PRO-????
-ã§ã™ã€‚ã“ã®ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¯ Lesser General Public License (LGPL) ライセンスã¨ã—ã¦
-公開ã•ã‚Œã¦ã¾ã™ã€‚COPYING.LESSER ã‚’å‚ç…§ã—ã¦ãã ã•ã„。
-
+Template - 日本語
+=======================
+
+
+ã¯ã˜ã‚ã«
+========
+
+クラスã«ã¤ã„ã¦ã¯ã€ `APIドã‚ュメンテーション`_ ã«å‚ç…§ã—ã¦ãã ã•ã„。
+
+.. _`APIドã‚ュメンテーション`:
+ doxygen/html/index.html
+
+æ¡ä»¶
+====
+
+Templateã¯OpenRTM-aist 1.0.0以上ã®C++版ãŒå¿…è¦ã§ã™ã€‚
+
+Template㯠CMake_ を使ã„ã¾ã™ã€‚CMake 2.8以上ãŒå¿…è¦ã§ã™ã€‚
+
+.. _CMAke:
+ http://www.cmake.org
+
+インストール
+============
+
+インストーラ
+------------
+
+Windowsã®ãƒ¦ãƒ¼ã‚¶ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ãƒ‘ッケージを使用ã—ã¦ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’インストール
+ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã“ã‚Œã¯ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆåŠã³ãã®ã™ã¹ã¦ã®å¿…è¦ãªãƒ©ã‚¤ãƒ–ラリを
+インストールã—ã¾ã™ã€‚Windowsã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹å ´åˆã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ã®ä½¿ç”¨ã‚’推奨ã—ã¦ã¾ã™ã€‚
+
+- インストーラをダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã•ã„。
+- インストールを始ã‚ã‚‹ãŸã‚ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ã‚’ダブルクリックã—ã¦ãã ã•ã„。
+- 指示ã«ã—ãŸãŒã£ã¦ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’インストールã—ã¦ãã ã•ã„。
+- 環境変数ã®å¤‰æ›´ã‚’é©ç”¨ã™ã‚‹ãŸã‚ã€ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’使用ã™ã‚‹å‰ã«ã‚³ãƒ³ãƒ”ューターを
+ å†èµ·å‹•ã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。
+
+Template㯠``TemplateComp`` ã®å®Ÿè¡Œã‚’ダブルクリックã—ã¦å®Ÿè¡Œã™ã‚‹ã“ã¨ãŒ
+ã§ãã¾ã™ã€‚ã‚ã‚‹ã„ã¯ã€ ``Template`` ã‚’åˆæœŸåŒ–関数㮠``TemplateInit`` を利用ã—ã¦ã€
+マãƒãƒ¼ã‚¸ãƒ£ã«ãƒãƒ¼ãƒ‰ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
+
+ソースã‹ã‚‰
+----------
+
+ソースを使ã†å ´åˆã¯ä»¥ä¸‹ã®æ‰‹é †ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•ã„。
+
+- ソースをダウンãƒãƒ¼ãƒ‰ã—ã¦è§£å‡ã—ã¦ãã ã•ã„::
+
+ tar -xvzf Template-1.0.0.tar.gz
+
+- 解å‡ã•ã‚ŒãŸãƒ•ã‚©ãƒ«ãƒ€ã«å…¥ã£ã¦ãã ã•ã„::
+
+ cd Template-1.0.0
+
+- ``build`` フォルダを作ã£ã¦ãã ã•ã„::
+
+ mkdir build
+
+- `` build`` フォルダã«å…¥ã£ã¦ãã ã•ã„::
+
+ cd build
+
+- CMakeを実行ã—ã¦ãã ã•ã„::
+
+ cmake ../
+
+- エラーãŒå‡ºç„¡ã„å ´åˆã€makeを実行ã—ã¦ãã ã•ã„::
+
+ make
+
+- ``make install`` ã§ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’インストールã—ã¦ãã ã•ã„。é¸æŠžã•ã‚ŒãŸ
+ ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å ´æ‰€ã«æ›¸ãè¾¼ã¿æ¨©é™ãŒã‚ã‚‹ã‹ã‚’確èªã—ã¦ãã ã•ã„::
+
+ ``make install``
+
+- インストールã™ã‚‹å ´æ‰€ã¯ccmakeを実行ã—㦠``CMAKE_INSTALL_PREFIX`` ã‚’
+ è¨å®šã™ã‚‹ã“ã¨ã§å¤‰æ›´ãŒå¯èƒ½ã§ã™ã€‚
+
+ ccmake ../
+
+ã“ã“ã¾ã§ã§ã€ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆãŒä½¿ãˆã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã—ãŸã€‚コンフィグレーションã¯æ¬¡ã®ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã‚’
+å‚ç…§ã—ã¦ãã ã•ã„。
+
+Template㯠``TemplateComp`` を実行（ ``${prefix}/components/bin`` ã«
+インストールã•ã‚Œã¾ã™ï¼‰ã™ã‚‹ã“ã¨ã§ã‚¹ã‚¿ãƒ³ãƒ‰ã‚¢ãƒãƒ¼ãƒ³ãƒ¢ãƒ¼ãƒ‰ã§å®Ÿè¡Œã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
+ã‚ã‚‹ã„ã¯ã€ ``libTemplate.so`` ã‚’åˆæœŸåŒ–関数㮠``TemplateInit`` を利用ã—ã¦ã€
+マãƒãƒ¼ã‚¸ãƒ£ã«ãƒãƒ¼ãƒ‰ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã“ã®ãƒ©ã‚¤ãƒ–ラリ㯠``${prefix}/components/lib``
+ã¾ãŸã¯ ``${prefix}/components/lib64`` ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™ã€‚
+
+
+コンフィグレーション
+====================
+
+使ãˆã‚‹ã‚³ãƒ³ãƒ•ã‚£ã‚°ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ãƒ‘ラメータã¯ä»¥ä¸‹ã®ãƒ†ãƒ¼ãƒ–ルをå‚ç…§
+ã—ã¦ãã ã•ã„。
+
+================ ================== ================ ====
+パラメータ データ型 デフォルト値 æ„味
+================ ================== ================ ====
+image_path char template.bmp
+================ ================== ================ ====
+
+ãƒãƒ¼ãƒˆ
+======
+
+コンãƒãƒ¼ãƒãƒ³ãƒˆã«ã‚ˆã£ã¦æä¾›ã•ã‚Œã‚‹ãƒãƒ¼ãƒˆã¯ä»¥ä¸‹ã®ãƒ†ãƒ¼ãƒ–ルã§è¿°ã¹ã‚‰ã‚Œã¦ã„ã¾ã™ã€‚
+
+=============== =========== ============================== ====
+ãƒãƒ¼ãƒˆå ãƒãƒ¼ãƒˆåž‹ データ型 æ„味
+=============== =========== ============================== ====
+original_image InPort RTC::CameraImage
+template OutPort RTC::CameraImage
+picture OutPort RTC::CameraImage
+=============== =========== ============================== ====
+
+例
+==
+
+例ã®rtc.confファイル㯠``${prefix}/components/share/Template/examples/conf/``
+フォルダã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™ã€‚
+
+Changelog
+=========
+
+
+License
+=======
+
+ã“ã®ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¯ç”£æ¥æŠ€è¡“ç·åˆç ”究所ã§é–‹ç™ºã•ã‚Œã¦ã„ã¾ã™ã€‚承èªç•ªå·ã¯H23PRO-????
+ã§ã™ã€‚ã“ã®ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¯ Lesser General Public License (LGPL) ライセンスã¨ã—ã¦
+公開ã•ã‚Œã¦ã¾ã™ã€‚COPYING.LESSER ã‚’å‚ç…§ã—ã¦ãã ã•ã„。
+
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/idl/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/idl/CMakeLists.txt 2014-03-17 08:36:10 UTC (rev 130)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/idl/CMakeLists.txt 2014-03-17 09:23:27 UTC (rev 131)
@@ -1,56 +1,56 @@
-set(idls )
-
-install(FILES ${idls} DESTINATION ${INC_INSTALL_DIR}/idl
- COMPONENT idl)
-
-macro(_IDL_OUTPUTS _idl _dir _result)
- set(${_result} ${_dir}/${_idl}SK.cc ${_dir}/${_idl}.hh
- ${_dir}/${_idl}DynSK.cc)
-endmacro(_IDL_OUTPUTS)
-
-macro(_COMPILE_IDL _idl_file)
- if(NOT WIN32)
- execute_process(COMMAND rtm-config --prefix OUTPUT_VARIABLE OPENRTM_DIR
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- execute_process(COMMAND rtm-config --idlflags OUTPUT_VARIABLE OPENRTM_IDLFLAGS
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- separate_arguments(OPENRTM_IDLFLAGS)
- execute_process(COMMAND rtm-config --idlc OUTPUT_VARIABLE OPENRTM_IDLC
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- set(_rtm_skelwrapper_command "rtm-skelwrapper")
- else(NOT WIN32)
- set(_rtm_skelwrapper_command "rtm-skelwrapper.py")
- endif(NOT WIN32)
- get_filename_component(_idl ${_idl_file} NAME_WE)
- set(_idl_srcs_var ${_idl}_SRCS)
- _IDL_OUTPUTS(${_idl} ${CMAKE_CURRENT_BINARY_DIR} ${_idl_srcs_var})
-
- add_custom_command(OUTPUT ${${_idl_srcs_var}}
- COMMAND python ${OPENRTM_DIR}/bin/${_rtm_skelwrapper_command} --include-dir= --skel-suffix=Skel --stub-suffix=Stub --idl-file=${_idl}.idl
- COMMAND ${OPENRTM_IDLC} ${OPENRTM_IDLFLAGS} ${_idl_file}
- WORKING_DIRECTORY ${CURRENT_BINARY_DIR}
- DEPENDS ${_idl_file}
- COMMENT "Compiling ${_idl_file}" VERBATIM)
- add_custom_target(${_idl}_TGT DEPENDS ${${_idl_srcs_var}})
- set(ALL_IDL_SRCS ${ALL_IDL_SRCS} ${${_idl_srcs_var}})
- if(NOT TARGET ALL_IDL_TGT)
- add_custom_target(ALL_IDL_TGT)
- endif(NOT TARGET ALL_IDL_TGT)
- add_dependencies(ALL_IDL_TGT ${_idl}_TGT)
-endmacro(_COMPILE_IDL)
-
-# Module exposed to the user
-macro(OPENRTM_COMPILE_IDL_FILES)
- foreach(idl ${ARGN})
- _COMPILE_IDL(${idl})
- endforeach(idl)
-endmacro(OPENRTM_COMPILE_IDL_FILES)
-
-
-OPENRTM_COMPILE_IDL_FILES(${idls})
-set(ALL_IDL_SRCS ${ALL_IDL_SRCS} PARENT_SCOPE)
+set(idls )
+
+#install(FILES ${idls} DESTINATION ${INC_INSTALL_DIR}/idl
+# COMPONENT idl)
+
+macro(_IDL_OUTPUTS _idl _dir _result)
+ set(${_result} ${_dir}/${_idl}SK.cc ${_dir}/${_idl}.hh
+ ${_dir}/${_idl}DynSK.cc)
+endmacro(_IDL_OUTPUTS)
+
+macro(_COMPILE_IDL _idl_file)
+ if(NOT WIN32)
+ execute_process(COMMAND rtm-config --prefix OUTPUT_VARIABLE OPENRTM_DIR
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND rtm-config --idlflags OUTPUT_VARIABLE OPENRTM_IDLFLAGS
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ separate_arguments(OPENRTM_IDLFLAGS)
+ execute_process(COMMAND rtm-config --idlc OUTPUT_VARIABLE OPENRTM_IDLC
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ set(_rtm_skelwrapper_command "rtm-skelwrapper")
+ else(NOT WIN32)
+ set(_rtm_skelwrapper_command "rtm-skelwrapper.py")
+ endif(NOT WIN32)
+ get_filename_component(_idl ${_idl_file} NAME_WE)
+ set(_idl_srcs_var ${_idl}_SRCS)
+ _IDL_OUTPUTS(${_idl} ${CMAKE_CURRENT_BINARY_DIR} ${_idl_srcs_var})
+
+ add_custom_command(OUTPUT ${${_idl_srcs_var}}
+ COMMAND python ${OPENRTM_DIR}/bin/${_rtm_skelwrapper_command} --include-dir= --skel-suffix=Skel --stub-suffix=Stub --idl-file=${_idl}.idl
+ COMMAND ${OPENRTM_IDLC} ${OPENRTM_IDLFLAGS} ${_idl_file}
+ WORKING_DIRECTORY ${CURRENT_BINARY_DIR}
+ DEPENDS ${_idl_file}
+ COMMENT "Compiling ${_idl_file}" VERBATIM)
+ add_custom_target(${_idl}_TGT DEPENDS ${${_idl_srcs_var}})
+ set(ALL_IDL_SRCS ${ALL_IDL_SRCS} ${${_idl_srcs_var}})
+ if(NOT TARGET ALL_IDL_TGT)
+ add_custom_target(ALL_IDL_TGT)
+ endif(NOT TARGET ALL_IDL_TGT)
+ add_dependencies(ALL_IDL_TGT ${_idl}_TGT)
+endmacro(_COMPILE_IDL)
+
+# Module exposed to the user
+macro(OPENRTM_COMPILE_IDL_FILES)
+ foreach(idl ${ARGN})
+ _COMPILE_IDL(${idl})
+ endforeach(idl)
+endmacro(OPENRTM_COMPILE_IDL_FILES)
+
+
+OPENRTM_COMPILE_IDL_FILES(${idls})
+set(ALL_IDL_SRCS ${ALL_IDL_SRCS} PARENT_SCOPE)
FILTER_LIST("${ALL_IDL_SRCS}" "hh$" idl_headers)
-install(FILES ${idl_headers}
- DESTINATION ${INC_INSTALL_DIR}/${PROJECT_NAME_LOWER}/idl
- COMPONENT headers)
-
+#install(FILES ${idl_headers}
+# DESTINATION ${INC_INSTALL_DIR}/${PROJECT_NAME_LOWER}/idl
+# COMPONENT headers)
+
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/include/Template/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/include/Template/CMakeLists.txt 2014-03-17 08:36:10 UTC (rev 130)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/include/Template/CMakeLists.txt 2014-03-17 09:23:27 UTC (rev 131)
@@ -1,7 +1,7 @@
set(hdrs Template.h
- PARENT_SCOPE
+# PARENT_SCOPE
)
-install(FILES ${hdrs} DESTINATION ${INC_INSTALL_DIR}/${PROJECT_NAME_LOWER}
- COMPONENT library)
+#install(FILES ${hdrs} DESTINATION ${INC_INSTALL_DIR}/${PROJECT_NAME_LOWER}
+# COMPONENT library)
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/include/Template/Template.h
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/include/Template/Template.h 2014-03-17 08:36:10 UTC (rev 130)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/include/Template/Template.h 2014-03-17 09:23:27 UTC (rev 131)
@@ -1,318 +1,318 @@
-// -*- C++ -*-
-/*!
- * @file Template.h
- * @brief Template image component
- * @date $Date$
- *
- * $Id$
- */
-
-#ifndef TEMPLATE_H
-#define TEMPLATE_H
-
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
-#include <rtm/idl/BasicDataTypeSkel.h>
-#include <rtm/idl/ExtendedDataTypesSkel.h>
-#include <rtm/idl/InterfaceDataTypesSkel.h>
-
-//OpenCV headr file include
-#include <cv.h>
-#include <cxcore.h>
-#include <highgui.h>
-
-#define THRESHOLD 50 // 2’l‰»‚ÌÛ‚Ì臒l
-#define THRESHOLD_MAX_VALUE 255 // 2’l‰»‚ÌÛ‚ÉŽg—p‚·‚éÅ‘å’l
-
-#define LINE_THICKNESS 1 // ü‚Ì‘¾‚³
-#define LINE_TYPE 8 // ü‚ÌŽí—Þ
-#define SHIFT 0 // À•W‚̬”“_ˆÈ‰º‚ÌŒ…‚ð•\‚·ƒrƒbƒg”
-
-// Service implementation headers
-// <rtc-template block="service_impl_h">
-
-// </rtc-template>
-
-// Service Consumer stub headers
-// <rtc-template block="consumer_stub_h">
-
-// </rtc-template>
-
-using namespace RTC;
-
-/*!
- * @class Template
- * @brief Template image component
- *
- */
-class Template
- : public RTC::DataFlowComponentBase
-{
- public:
- /*!
- * @brief constructor
- * @param manager Maneger Object
- */
- Template(RTC::Manager* manager);
-
- /*!
- * @brief destructor
- */
- ~Template();
-
- // <rtc-template block="public_attribute">
-
- // </rtc-template>
-
- // <rtc-template block="public_operation">
-
- // </rtc-template>
-
- /***
- *
- * The initialize action (on CREATED->ALIVE transition)
- * formaer rtc_init_entry()
- *
- * @return RTC::ReturnCode_t
- *
- *
- */
- virtual RTC::ReturnCode_t onInitialize();
-
- /***
- *
- * The finalize action (on ALIVE->END transition)
- * formaer rtc_exiting_entry()
- *
- * @return RTC::ReturnCode_t
- *
- *
- */
- // virtual RTC::ReturnCode_t onFinalize();
-
- /***
- *
- * The startup action when ExecutionContext startup
- * former rtc_starting_entry()
- *
- * @param ec_id target ExecutionContext Id
- *
- * @return RTC::ReturnCode_t
- *
- *
- */
- // virtual RTC::ReturnCode_t onStartup(RTC::UniqueId ec_id);
-
- /***
- *
- * The shutdown action when ExecutionContext stop
- * former rtc_stopping_entry()
- *
- * @param ec_id target ExecutionContext Id
- *
- * @return RTC::ReturnCode_t
- *
- *
- */
- // virtual RTC::ReturnCode_t onShutdown(RTC::UniqueId ec_id);
-
- /***
- *
- * The activated action (Active state entry action)
- * former rtc_active_entry()
- *
- * @param ec_id target ExecutionContext Id
- *
- * @return RTC::ReturnCode_t
- *
- *
- */
- virtual RTC::ReturnCode_t onActivated(RTC::UniqueId ec_id);
-
- /***
- *
- * The deactivated action (Active state exit action)
- * former rtc_active_exit()
- *
- * @param ec_id target ExecutionContext Id
- *
- * @return RTC::ReturnCode_t
- *
- *
- */
- virtual RTC::ReturnCode_t onDeactivated(RTC::UniqueId ec_id);
-
- /***
- *
- * The execution action that is invoked periodically
- * former rtc_active_do()
- *
- * @param ec_id target ExecutionContext Id
- *
- * @return RTC::ReturnCode_t
- *
- *
- */
- virtual RTC::ReturnCode_t onExecute(RTC::UniqueId ec_id);
-
- /***
- *
- * The aborting action when main logic error occurred.
- * former rtc_aborting_entry()
- *
- * @param ec_id target ExecutionContext Id
- *
- * @return RTC::ReturnCode_t
- *
- *
- */
- // virtual RTC::ReturnCode_t onAborting(RTC::UniqueId ec_id);
-
- /***
- *
- * The error action in ERROR state
- * former rtc_error_do()
- *
- * @param ec_id target ExecutionContext Id
- *
- * @return RTC::ReturnCode_t
- *
- *
- */
- // virtual RTC::ReturnCode_t onError(RTC::UniqueId ec_id);
-
- /***
- *
- * 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
- *
- *
- */
- // virtual RTC::ReturnCode_t onReset(RTC::UniqueId ec_id);
-
- /***
- *
- * 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
- *
- *
- */
- // virtual RTC::ReturnCode_t onStateUpdate(RTC::UniqueId ec_id);
-
- /***
- *
- * The action that is invoked when execution context's rate is changed
- * no corresponding operation exists in OpenRTm-aist-0.2.0
- *
- * @param ec_id target ExecutionContext Id
- *
- * @return RTC::ReturnCode_t
- *
- *
- */
- // virtual RTC::ReturnCode_t onRateChanged(RTC::UniqueId ec_id);
-
-
- protected:
- // <rtc-template block="protected_attribute">
-
- // </rtc-template>
-
- // <rtc-template block="protected_operation">
-
- // </rtc-template>
-
- // Configuration variable declaration
- // <rtc-template block="config_declare">
- /*!
- *
- * - Name: img_path
- * - DefaultValue: ""
- */
- char m_img_path[50];
-
- // </rtc-template>
-
- // DataInPort declaration
- // <rtc-template block="inport_declare">
- RTC::CameraImage m_image_orig;
- /*!
- */
- InPort<RTC::CameraImage> m_image_origIn;
-
- // </rtc-template>
-
-
- // DataOutPort declaration
- // <rtc-template block="outport_declare">
- RTC::CameraImage m_image_template;
- /*!
- */
- OutPort<RTC::CameraImage> m_image_templateOut;
- RTC::CameraImage m_image_picture;
- /*!
- */
- OutPort<RTC::CameraImage> m_image_pictureOut;
-
- // </rtc-template>
-
- // CORBA Port declaration
- // <rtc-template block="corbaport_declare">
-
- // </rtc-template>
-
- // Service declaration
- // <rtc-template block="service_declare">
-
- // </rtc-template>
-
- // Consumer declaration
- // <rtc-template block="consumer_declare">
-
- // </rtc-template>
-
- private:
- // <rtc-template block="private_attribute">
-
- // </rtc-template>
-
- // <rtc-template block="private_operation">
-
- // </rtc-template>
- int templateID;
- int templateWidth, templateHeight;
- int flag;
- IplImage* templateImage;
- IplImage* templateGrayImage;
- IplImage* templateBinaryImage;
-
- IplImage* imageBuff;
- IplImage* sourceGrayImage;
- IplImage* sourceBinaryImage;
-
- IplImage* differenceMapImage;
-
- CvPoint minLocation;
-
- int len;
-
-};
-
-
-extern "C"
-{
- DLL_EXPORT void TemplateInit(RTC::Manager* manager);
-};
-
-#endif // TEMPLATE_H
+// -*- C++ -*-
+/*!
+ * @file Template.h
+ * @brief Template image component
+ * @date $Date$
+ *
+ * $Id$
+ */
+
+#ifndef TEMPLATE_H
+#define TEMPLATE_H
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+#include <rtm/idl/BasicDataTypeSkel.h>
+#include <rtm/idl/ExtendedDataTypesSkel.h>
+#include <rtm/idl/InterfaceDataTypesSkel.h>
+
+//OpenCV headr file include
+#include <cv.h>
+#include <cxcore.h>
+#include <highgui.h>
+
+#define THRESHOLD 50 /* 2値化ã®éš›ã®é–¾å€¤ */
+#define THRESHOLD_MAX_VALUE 255 /* 2値化ã®éš›ã«ä½¿ç”¨ã™ã‚‹æœ€å¤§å€¤ */
+
+#define LINE_THICKNESS 1 /* ç·šã®å¤ªã• */
+#define LINE_TYPE 8 /* ç·šã®ç¨®é¡ž */
+#define SHIFT 0 /* 座標ã®å°æ•°ç‚¹ä»¥ä¸‹ã®æ¡ã‚’表ã™ãƒ“ット数 */
+
+// Service implementation headers
+// <rtc-template block="service_impl_h">
+
+// </rtc-template>
+
+// Service Consumer stub headers
+// <rtc-template block="consumer_stub_h">
+
+// </rtc-template>
+
+using namespace RTC;
+
+/*!
+ * @class Template
+ * @brief Template image component
+ *
+ */
+class Template
+ : public RTC::DataFlowComponentBase
+{
+ public:
+ /*!
+ * @brief constructor
+ * @param manager Maneger Object
+ */
+ Template(RTC::Manager* manager);
+
+ /*!
+ * @brief destructor
+ */
+ ~Template();
+
+ // <rtc-template block="public_attribute">
+
+ // </rtc-template>
+
+ // <rtc-template block="public_operation">
+
+ // </rtc-template>
+
+ /***
+ *
+ * The initialize action (on CREATED->ALIVE transition)
+ * formaer rtc_init_entry()
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ virtual RTC::ReturnCode_t onInitialize();
+
+ /***
+ *
+ * The finalize action (on ALIVE->END transition)
+ * formaer rtc_exiting_entry()
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onFinalize();
+
+ /***
+ *
+ * The startup action when ExecutionContext startup
+ * former rtc_starting_entry()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onStartup(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The shutdown action when ExecutionContext stop
+ * former rtc_stopping_entry()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onShutdown(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The activated action (Active state entry action)
+ * former rtc_active_entry()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ virtual RTC::ReturnCode_t onActivated(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The deactivated action (Active state exit action)
+ * former rtc_active_exit()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ virtual RTC::ReturnCode_t onDeactivated(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The execution action that is invoked periodically
+ * former rtc_active_do()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ virtual RTC::ReturnCode_t onExecute(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The aborting action when main logic error occurred.
+ * former rtc_aborting_entry()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onAborting(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The error action in ERROR state
+ * former rtc_error_do()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onError(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * 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
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onReset(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * 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
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onStateUpdate(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The action that is invoked when execution context's rate is changed
+ * no corresponding operation exists in OpenRTm-aist-0.2.0
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onRateChanged(RTC::UniqueId ec_id);
+
+
+ protected:
+ // <rtc-template block="protected_attribute">
+
+ // </rtc-template>
+
+ // <rtc-template block="protected_operation">
+
+ // </rtc-template>
+
+ // Configuration variable declaration
+ // <rtc-template block="config_declare">
+ /*!
+ *
+ * - Name: img_path
+ * - DefaultValue: template.bmp
+ */
+ char m_img_path[50];
+
+ // </rtc-template>
+
+ // DataInPort declaration
+ // <rtc-template block="inport_declare">
+ RTC::CameraImage m_image_orig;
+ /*!
+ */
+ InPort<RTC::CameraImage> m_image_origIn;
+
+ // </rtc-template>
+
+
+ // DataOutPort declaration
+ // <rtc-template block="outport_declare">
+ RTC::CameraImage m_image_template;
+ /*!
+ */
+ OutPort<RTC::CameraImage> m_image_templateOut;
+ RTC::CameraImage m_image_picture;
+ /*!
+ */
+ OutPort<RTC::CameraImage> m_image_pictureOut;
+
+ // </rtc-template>
+
+ // CORBA Port declaration
+ // <rtc-template block="corbaport_declare">
+
+ // </rtc-template>
+
+ // Service declaration
+ // <rtc-template block="service_declare">
+
+ // </rtc-template>
+
+ // Consumer declaration
+ // <rtc-template block="consumer_declare">
+
+ // </rtc-template>
+
+ private:
+ // <rtc-template block="private_attribute">
+
+ // </rtc-template>
+
+ // <rtc-template block="private_operation">
+
+ // </rtc-template>
+ int templateID;
+ int templateWidth, templateHeight;
+ int flag;
+ IplImage* templateImage;
+ IplImage* templateGrayImage;
+ IplImage* templateBinaryImage;
+
+ IplImage* imageBuff;
+ IplImage* sourceGrayImage;
+ IplImage* sourceBinaryImage;
+
+ IplImage* differenceMapImage;
+
+ CvPoint minLocation;
+
+ int len;
+
+};
+
+
+extern "C"
+{
+ DLL_EXPORT void TemplateInit(RTC::Manager* manager);
+};
+
+#endif // TEMPLATE_H
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/src/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/src/CMakeLists.txt 2014-03-17 08:36:10 UTC (rev 130)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/src/CMakeLists.txt 2014-03-17 09:23:27 UTC (rev 131)
@@ -1,63 +1,69 @@
-set(comp_srcs Template.cpp )
-set(standalone_srcs TemplateComp.cpp)
-
+set(comp_srcs Template.cpp )
+set(standalone_srcs TemplateComp.cpp)
+
find_package(OpenCV REQUIRED)
-if (DEFINED OPENRTM_INCLUDE_DIRS)
- string(REGEX REPLACE "-I" ";"
- OPENRTM_INCLUDE_DIRS "${OPENRTM_INCLUDE_DIRS}")
- string(REGEX REPLACE " ;" ";"
- OPENRTM_INCLUDE_DIRS "${OPENRTM_INCLUDE_DIRS}")
-endif (DEFINED OPENRTM_INCLUDE_DIRS)
-
-if (DEFINED OPENRTM_LIBRARY_DIRS)
- string(REGEX REPLACE "-L" ";"
- OPENRTM_LIBRARY_DIRS "${OPENRTM_LIBRARY_DIRS}")
- string(REGEX REPLACE " ;" ";"
- OPENRTM_LIBRARY_DIRS "${OPENRTM_LIBRARY_DIRS}")
-endif (DEFINED OPENRTM_LIBRARY_DIRS)
-
-if (DEFINED OPENRTM_LIBRARIES)
- string(REGEX REPLACE "-l" ";"
- OPENRTM_LIBRARIES "${OPENRTM_LIBRARIES}")
- string(REGEX REPLACE " ;" ";"
- OPENRTM_LIBRARIES "${OPENRTM_LIBRARIES}")
-endif (DEFINED OPENRTM_LIBRARIES)
-
-include_directories(${PROJECT_SOURCE_DIR}/include)
-include_directories(${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME})
-include_directories(${PROJECT_BINARY_DIR})
-include_directories(${PROJECT_BINARY_DIR}/idl)
-include_directories(${OPENRTM_INCLUDE_DIRS})
-include_directories(${OMNIORB_INCLUDE_DIRS})
-add_definitions(${OPENRTM_CFLAGS})
-add_definitions(${OMNIORB_CFLAGS})
-
-MAP_ADD_STR(comp_hdrs "../" comp_headers)
-
-link_directories(${OPENRTM_LIBRARY_DIRS})
-link_directories(${OMNIORB_LIBRARY_DIRS})
-
-add_library(${PROJECT_NAME} ${LIB_TYPE} ${comp_srcs}
- ${comp_headers} ${ALL_IDL_SRCS})
-set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
-set_source_files_properties(${ALL_IDL_SRCS} PROPERTIES GENERATED 1)
-add_dependencies(${PROJECT_NAME} ALL_IDL_TGT)
+if (DEFINED OPENRTM_INCLUDE_DIRS)
+ string(REGEX REPLACE "-I" ";"
+ OPENRTM_INCLUDE_DIRS "${OPENRTM_INCLUDE_DIRS}")
+ string(REGEX REPLACE " ;" ";"
+ OPENRTM_INCLUDE_DIRS "${OPENRTM_INCLUDE_DIRS}")
+endif (DEFINED OPENRTM_INCLUDE_DIRS)
+
+if (DEFINED OPENRTM_LIBRARY_DIRS)
+ string(REGEX REPLACE "-L" ";"
+ OPENRTM_LIBRARY_DIRS "${OPENRTM_LIBRARY_DIRS}")
+ string(REGEX REPLACE " ;" ";"
+ OPENRTM_LIBRARY_DIRS "${OPENRTM_LIBRARY_DIRS}")
+endif (DEFINED OPENRTM_LIBRARY_DIRS)
+
+if (DEFINED OPENRTM_LIBRARIES)
+ string(REGEX REPLACE "-l" ";"
+ OPENRTM_LIBRARIES "${OPENRTM_LIBRARIES}")
+ string(REGEX REPLACE " ;" ";"
+ OPENRTM_LIBRARIES "${OPENRTM_LIBRARIES}")
+endif (DEFINED OPENRTM_LIBRARIES)
+
+include_directories(${PROJECT_SOURCE_DIR}/include)
+include_directories(${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME})
+include_directories(${PROJECT_BINARY_DIR})
+include_directories(${PROJECT_BINARY_DIR}/idl)
+include_directories(${OPENRTM_INCLUDE_DIRS})
+include_directories(${OMNIORB_INCLUDE_DIRS})
+add_definitions(${OPENRTM_CFLAGS})
+add_definitions(${OMNIORB_CFLAGS})
+
+MAP_ADD_STR(comp_hdrs "../" comp_headers)
+
+link_directories(${OPENRTM_LIBRARY_DIRS})
+link_directories(${OMNIORB_LIBRARY_DIRS})
+
+add_library(${PROJECT_NAME} ${LIB_TYPE} ${comp_srcs}
+ ${comp_headers} ${ALL_IDL_SRCS})
+set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
+set_source_files_properties(${ALL_IDL_SRCS} PROPERTIES GENERATED 1)
+add_dependencies(${PROJECT_NAME} ALL_IDL_TGT)
target_link_libraries(${PROJECT_NAME} ${OPENRTM_LIBRARIES} ${OpenCV_LIBS})
-
-add_executable(${PROJECT_NAME}Comp ${standalone_srcs}
- ${comp_srcs} ${comp_headers} ${ALL_IDL_SRCS})
+
+add_executable(${PROJECT_NAME}Comp ${standalone_srcs}
+ ${comp_srcs} ${comp_headers} ${ALL_IDL_SRCS})
target_link_libraries(${PROJECT_NAME}Comp ${OPENRTM_LIBRARIES} ${OpenCV_LIBS})
+
+#install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}Comp
+# EXPORT ${PROJECT_NAME}
+# RUNTIME DESTINATION ${BIN_INSTALL_DIR} COMPONENT component
+# LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT component
+# ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT component)
+#install(EXPORT ${PROJECT_NAME}
+# DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}
+# FILE ${PROJECT_NAME}Depends.cmake)
+install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}Comp
+ EXPORT ${PROJECT_NAME}
+ RUNTIME DESTINATION ${INSTALL_PREFIX} COMPONENT component
+ LIBRARY DESTINATION ${INSTALL_PREFIX} COMPONENT component
+ ARCHIVE DESTINATION ${INSTALL_PREFIX} COMPONENT component)
+
-install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}Comp
- EXPORT ${PROJECT_NAME}
- RUNTIME DESTINATION ${BIN_INSTALL_DIR} COMPONENT component
- LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT component
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT component)
-install(EXPORT ${PROJECT_NAME}
- DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}
- FILE ${PROJECT_NAME}Depends.cmake)
-
if (SolutionDir)
if (MSVC)
add_custom_command(
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/src/Template.cpp
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/src/Template.cpp 2014-03-17 08:36:10 UTC (rev 130)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Template/src/Template.cpp 2014-03-17 09:23:27 UTC (rev 131)
@@ -1,356 +1,353 @@
-// -*- C++ -*-
-/*!
- * @file Template.cpp
- * @brief Template image component
- * @date $Date$
- *
- * $Id$
- */
-
-#include "Template.h"
-#include <iostream>
-using namespace std;
-
-// Module specification
-// <rtc-template block="module_spec">
-static const char* template_spec[] =
- {
- "implementation_id", "Template",
- "type_name", "Template",
- "description", "Template image component",
- "version", "1.0.0",
- "vendor", "AIST",
- "category", "Category",
- "activity_type", "PERIODIC",
- "kind", "DataFlowComponent",
- "max_instance", "1",
- "language", "C++",
- "lang_type", "compile",
- // Configuration variables
- "conf.default.image_path", "",
- // Widget
- "conf.__widget__.image_path", "text",
- // Constraints
- "conf.__constraints__.image_path", "[50]",
- ""
- };
-// </rtc-template>
-
-/*!
- * @brief constructor
- * @param manager Maneger Object
- */
-Template::Template(RTC::Manager* manager)
- // <rtc-template block="initializer">
- : RTC::DataFlowComponentBase(manager),
- m_image_origIn("original_image", m_image_orig),
- m_image_templateOut("template", m_image_template),
- m_image_pictureOut("picture", m_image_picture)
-
- // </rtc-template>
-{
-}
-
-/*!
- * @brief destructor
- */
-Template::~Template()
-{
-}
-
-
-
-RTC::ReturnCode_t Template::onInitialize()
-{
- // Registration: InPort/OutPort/Service
- // <rtc-template block="registration">
- // Set InPort buffers
- addInPort("original_image", m_image_origIn);
-
- // Set OutPort buffer
- addOutPort("template", m_image_templateOut);
- addOutPort("picture", m_image_pictureOut);
-
- // Set service provider to Ports
-
- // Set service consumers to Ports
-
- // Set CORBA Service Ports
-
- // </rtc-template>
-
- // <rtc-template block="bind_config">
- // Bind variables and configuration variable
- bindParameter("image_path", m_img_path, "template.bmp");
- // </rtc-template>
-
- return RTC::RTC_OK;
-}
-
-/*
-RTC::ReturnCode_t Template::onFinalize()
-{
- return RTC::RTC_OK;
-}
-*/
-
-/*
-RTC::ReturnCode_t Template::onStartup(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-/*
-RTC::ReturnCode_t Template::onShutdown(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-
-RTC::ReturnCode_t Template::onActivated(RTC::UniqueId ec_id)
-{
-
- // ‘Îۉ摜—pƒƒ‚ƒŠ‚̉Šú‰»
- templateID = -1;
- templateWidth = 0;
- templateHeight = 0;
- templateImage = NULL;
- templateGrayImage = NULL;
- templateBinaryImage = NULL;
-
- // ƒCƒ[ƒW—pƒƒ‚ƒŠ‚̉Šú‰»
- imageBuff = NULL;
- sourceGrayImage = NULL;
- sourceBinaryImage = NULL;
- differenceMapImage = NULL;
-
- // OutPort‚P‚̉æ–ʃTƒCƒY‚̉Šú‰»
- m_image_template.width = 0;
- m_image_template.height = 0;
-
- len = 0;
- flag = 0;
-
- return RTC::RTC_OK;
-}
-
-
-RTC::ReturnCode_t Template::onDeactivated(RTC::UniqueId ec_id)
-{
-
- if(imageBuff != NULL)
- {
- // ƒCƒ[ƒW—pƒƒ‚ƒŠ‚̉ð•ú
- cvReleaseImage(&imageBuff);
- cvReleaseImage(&sourceGrayImage);
- cvReleaseImage(&sourceBinaryImage);
- cvReleaseImage(&differenceMapImage);
- }
-
- if( templateImage != NULL )
- {
- cvReleaseImage(&templateImage);
- cvReleaseImage(&templateGrayImage);
- cvReleaseImage(&templateBinaryImage);
- }
-
- return RTC::RTC_OK;
-}
-
-
-RTC::ReturnCode_t Template::onExecute(RTC::UniqueId ec_id)
-{
- // V‚µ‚¢ƒf[ƒ^‚̃`ƒFƒbƒN
- if(m_image_origIn.isNew())
- {
- // InPortƒf[ƒ^‚Ì“Ç‚Ýž‚Ý
- m_image_origIn.read();
-
- // ‘Îۉ摜‚ð“Ç‚Ýž‚Þ
- templateImage = cvLoadImage( m_img_path, CV_LOAD_IMAGE_ANYDEPTH | CV_LOAD_IMAGE_ANYCOLOR );
-
- if( templateImage == NULL )
- {
- templateID = -1 ;
- templateWidth = templateHeight = 0;
- }
-
- // ‘Îۉ摜ƒ`ƒFƒbƒN
- // ‘Îۉ摜‚ÌPath‚Æ‚©–¼‚ª–³‚¢ê‡ƒeƒ“ƒvƒŒ[ƒgƒ}ƒbƒ`ƒ“ƒO‚µ‚È‚‚Ä“ü—Í‚³‚ꂽƒCƒ[ƒW‚ð‚»‚Ì‚Ü‚Üo—Í
- if( templateImage != NULL && templateID != templateImage->ID )
- {
- // ƒtƒ‰ƒbƒOÝ’è(³‚µ‚¢‘Îۉ摜‚ª“ü—Íj
- flag = 1;
- templateID = templateImage->ID;
- templateWidth = templateImage->width;
- templateHeight = templateImage->height;
-
- if(templateGrayImage != NULL)
- {
- cvReleaseImage(&templateGrayImage);
- cvReleaseImage(&templateBinaryImage);
- }
-
- // ‘Îۉ摜—p‚̃ƒ‚ƒŠŠm•Û
- templateGrayImage = cvCreateImage( cvGetSize(templateImage), IPL_DEPTH_8U, 1 );
- templateBinaryImage = cvCreateImage( cvGetSize(templateImage), IPL_DEPTH_8U, 1 );
-
- // ‘Îۉ摜IDAƒTƒCƒYo—Í
- cout << "templateID : "<<templateID<<endl;
- cout << "template - width :"<<templateWidth<<endl;
- cout << "template - height :"<<templateHeight<<endl;
-
- // RGB‚©‚çƒOƒŒ[ƒXƒP[ƒ‹‚É•ÏŠ·‚·‚é
- cvCvtColor( templateImage, templateGrayImage, CV_RGB2GRAY );
-
- // ƒOƒŒ[ƒXƒP[ƒ‹‚©‚ç2’l‚É•ÏŠ·‚·‚é
- cvThreshold( templateGrayImage, templateBinaryImage, THRESHOLD, THRESHOLD_MAX_VALUE, CV_THRESH_BINARY );
-
- // OutPort‚Q—p‚̉æ–ʃTƒCƒY‰Šú‰»
- m_image_picture.width = templateImage->width;
- m_image_picture.height = templateImage->height;
- }
-
- // InPort‚ÆOutPort‚̉æ–ʃTƒCƒYˆ—‚¨‚æ‚уCƒ[ƒW—pƒƒ‚ƒŠ‚ÌŠm•Û(³‚µ‚¢‘Îۉ摜‚ª“ü‚ê‚é‚ÆdifferenceMapImage‚ª•ÏŠ·‚³‚ê‚é-ƒtƒ‰ƒbƒO‚ðŒ©‚Ä”»’fj
- if(m_image_orig.width != m_image_template.width || m_image_orig.height != m_image_template.height || flag == 1)
- {
- flag = 0;
- m_image_template.width = m_image_orig.width;
- m_image_template.height = m_image_orig.height;
-
- // InPort‚̃Cƒ[ƒWƒTƒCƒY‚ª•ÏX‚³‚ꂽê‡
- if(imageBuff != NULL)
- {
- cvReleaseImage(&imageBuff);
- cvReleaseImage(&sourceGrayImage);
- cvReleaseImage(&sourceBinaryImage);
- cvReleaseImage(&differenceMapImage);
- }
- // ƒCƒ[ƒW—pƒƒ‚ƒŠ‚ÌŠm•Û
- imageBuff = cvCreateImage( cvSize(m_image_orig.width, m_image_orig.height), IPL_DEPTH_8U, 3 );
- sourceGrayImage = cvCreateImage( cvSize(m_image_orig.width, m_image_orig.height), IPL_DEPTH_8U, 1 );
- sourceBinaryImage = cvCreateImage( cvSize(m_image_orig.width, m_image_orig.height), IPL_DEPTH_8U, 1 );
- differenceMapImage = cvCreateImage( cvSize( m_image_orig.width - templateWidth + 1, m_image_orig.height - templateHeight + 1 ), IPL_DEPTH_32F, 1 );
- }
-
- // InPort‚̉摜ƒf[ƒ^‚ðƒRƒs[
- memcpy( imageBuff->imageData, (void *)&(m_image_orig.pixels[0]), m_image_orig.pixels.length() );
-
- if( templateImage != NULL )
- {
- // RGB‚©‚çƒOƒŒ[ƒXƒP[ƒ‹‚É•ÏŠ·‚·‚é
- cvCvtColor( imageBuff, sourceGrayImage, CV_RGB2GRAY );
-
- // ƒOƒŒ[ƒXƒP[ƒ‹‚©‚ç2’l‚É•ÏŠ·‚·‚é
- cvThreshold( sourceGrayImage, sourceBinaryImage, THRESHOLD, THRESHOLD_MAX_VALUE, CV_THRESH_BINARY );
-
- // ƒeƒ“ƒvƒŒ[ƒgƒ}ƒbƒ`ƒ“ƒO‚ðs‚¤
- cvMatchTemplate( sourceBinaryImage, templateBinaryImage, differenceMapImage, CV_TM_SQDIFF );
-
- // ƒeƒ“ƒvƒŒ[ƒg‚ªŒ³‰æ‘œ‚Ì‚Ç‚Ì•”•ª‚É‚ ‚é‚Ì‚©‚Æ‚¢‚¤î•ñ‚𓾂é
- cvMinMaxLoc( differenceMapImage, NULL, NULL, &minLocation, NULL, NULL );
-
- // ˆê’v‚·‚éêŠ‚ðŒ³‰æ‘œ‚ÉŽlŠp‚Å•`‚
- cvRectangle(
- imageBuff,
- minLocation,
- cvPoint( minLocation.x + templateImage->width, minLocation.y + templateImage->height ),
- CV_RGB( 255, 0, 0 ),
- LINE_THICKNESS,
- LINE_TYPE,
- SHIFT
- );
-
- // ‰æ‘œƒf[ƒ^‚̃TƒCƒYŽæ“¾
- len = imageBuff->nChannels * imageBuff->width * imageBuff->height;
- m_image_template.pixels.length(len);
-
- // ”½“]‚µ‚½‰æ‘œƒf[ƒ^‚ðOutPort‚ɃRƒs[
- memcpy( (void *)&(m_image_template.pixels[0]), imageBuff->imageData, len );
-
- // ”½“]‚µ‚½‰æ‘œƒf[ƒ^‚ðOutPort‚©‚ço—Í
- m_image_templateOut.write();
-
- // ‘Îۉ摜ƒf[ƒ^‚̃TƒCƒYŽæ“¾
- len = templateImage->nChannels * templateImage->width * templateImage->height;
- m_image_picture.pixels.length(len);
-
- // ”½“]‚µ‚½‘Îۉ摜ƒf[ƒ^‚ðOutPort‚ɃRƒs[
-
- memcpy( (void *)&(m_image_picture.pixels[0]), templateImage->imageData, len );
-
- // ”½“]‚µ‚½‘Îۉ摜ƒf[ƒ^‚ðOutPort‚©‚ço—Í
- m_image_pictureOut.write();
-
- }else{
-
- // ‰æ‘œƒf[ƒ^‚̃TƒCƒYŽæ“¾
- len = imageBuff->nChannels * imageBuff->width * imageBuff->height;
- m_image_template.pixels.length(len);
-
- // ”½“]‚µ‚½‰æ‘œƒf[ƒ^‚ðOutPort‚ɃRƒs[
- memcpy( (void *)&(m_image_template.pixels[0]), imageBuff->imageData, len );
-
- // ”½“]‚µ‚½‰æ‘œƒf[ƒ^‚ðOutPort‚©‚ço—Í
- m_image_templateOut.write();
-
- }
-
- cvReleaseImage(&templateImage);
- }
- return RTC::RTC_OK;
-}
-
-/*
-RTC::ReturnCode_t Template::onAborting(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-/*
-RTC::ReturnCode_t Template::onError(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-/*
-RTC::ReturnCode_t Template::onReset(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-/*
-RTC::ReturnCode_t Template::onStateUpdate(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-/*
-RTC::ReturnCode_t Template::onRateChanged(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-
-
-extern "C"
-{
-
- void TemplateInit(RTC::Manager* manager)
- {
- coil::Properties profile(template_spec);
- manager->registerFactory(profile,
- RTC::Create<Template>,
- RTC::Delete<Template>);
- }
-
-};
-
-
+// -*- C++ -*-
+/*!
+ * @file Template.cpp
+ * @brief Template image component
+ * @date $Date$
+ *
+ * $Id$
+ */
+
+#include "Template.h"
+#include <iostream>
+using namespace std;
+
+// Module specification
+// <rtc-template block="module_spec">
+static const char* template_spec[] =
+ {
+ "implementation_id", "Template",
+ "type_name", "Template",
+ "description", "Template image component",
+ "version", "1.1.0",
+ "vendor", "AIST",
+ "category", "Category",
+ "activity_type", "PERIODIC",
+ "kind", "DataFlowComponent",
+ "max_instance", "1",
+ "language", "C++",
+ "lang_type", "compile",
+ // Configuration variables
+ "conf.default.image_path", "template.bmp",
+ // Widget
+ "conf.__widget__.image_path", "text",
+ // Constraints
+ "conf.__constraints__.image_path", "[50]",
+ ""
+ };
+// </rtc-template>
+
+/*!
+ * @brief constructor
+ * @param manager Maneger Object
+ */
+Template::Template(RTC::Manager* manager)
+ // <rtc-template block="initializer">
+ : RTC::DataFlowComponentBase(manager),
+ m_image_origIn("original_image", m_image_orig),
+ m_image_templateOut("template", m_image_template),
+ m_image_pictureOut("picture", m_image_picture)
+
+ // </rtc-template>
+{
+}
+
+/*!
+ * @brief destructor
+ */
+Template::~Template()
+{
+}
+
+
+
+RTC::ReturnCode_t Template::onInitialize()
+{
+ // Registration: InPort/OutPort/Service
+ // <rtc-template block="registration">
+ // Set InPort buffers
+ addInPort("original_image", m_image_origIn);
+
+ // Set OutPort buffer
+ addOutPort("template", m_image_templateOut);
+ addOutPort("picture", m_image_pictureOut);
+
+ // Set service provider to Ports
+
+ // Set service consumers to Ports
+
+ // Set CORBA Service Ports
+
+ // </rtc-template>
+
+ // <rtc-template block="bind_config">
+ // Bind variables and configuration variable
+ bindParameter("image_path", m_img_path, "template.bmp");
+ // </rtc-template>
+
+ return RTC::RTC_OK;
+}
+
+/*
+RTC::ReturnCode_t Template::onFinalize()
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t Template::onStartup(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t Template::onShutdown(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+
+RTC::ReturnCode_t Template::onActivated(RTC::UniqueId ec_id)
+{
+
+ /* 対象画åƒç”¨ãƒ¡ãƒ¢ãƒªã®åˆæœŸåŒ– */
+ templateID = -1;
+ templateWidth = 0;
+ templateHeight = 0;
+ templateImage = NULL;
+ templateGrayImage = NULL;
+ templateBinaryImage = NULL;
+
+ /* イメージ用メモリã®åˆæœŸåŒ– */
+ imageBuff = NULL;
+ sourceGrayImage = NULL;
+ sourceBinaryImage = NULL;
+ differenceMapImage = NULL;
+
+ /* OutPort１ã®ç”»é¢ã‚µã‚¤ã‚ºã®åˆæœŸåŒ– */
+ m_image_template.width = 0;
+ m_image_template.height = 0;
+
+ len = 0;
+ flag = 0;
+
+ return RTC::RTC_OK;
+}
+
+
+RTC::ReturnCode_t Template::onDeactivated(RTC::UniqueId ec_id)
+{
+
+ if(imageBuff != NULL)
+ {
+ /* イメージ用メモリã®è§£æ”¾ */
+ cvReleaseImage(&imageBuff);
+ cvReleaseImage(&sourceGrayImage);
+ cvReleaseImage(&sourceBinaryImage);
+ cvReleaseImage(&differenceMapImage);
+ }
+
+ if( templateImage != NULL )
+ {
+ cvReleaseImage(&templateImage);
+ cvReleaseImage(&templateGrayImage);
+ cvReleaseImage(&templateBinaryImage);
+ }
+
+ return RTC::RTC_OK;
+}
+
+
+RTC::ReturnCode_t Template::onExecute(RTC::UniqueId ec_id)
+{
+ /* æ–°ã—ã„データã®ãƒã‚§ãƒƒã‚¯ */
+ if(m_image_origIn.isNew())
+ {
+ /* InPortデータã®èªã¿è¾¼ã¿ */
+ m_image_origIn.read();
+
+ /* 対象画åƒã‚’èªã¿è¾¼ã‚€ */
+ templateImage = cvLoadImage( m_img_path, CV_LOAD_IMAGE_ANYDEPTH | CV_LOAD_IMAGE_ANYCOLOR );
+
+ if( templateImage == NULL )
+ {
+ templateID = -1 ;
+ templateWidth = templateHeight = 0;
+ }
+
+ /* 対象画åƒãƒã‚§ãƒƒã‚¯ */
+ /* 対象画åƒã®Pathã¨ã‹åãŒç„¡ã„å ´åˆãƒ†ãƒ³ãƒ—レートマッãƒãƒ³ã‚°ã—ãªãã¦å…¥åŠ›ã•ã‚ŒãŸã‚¤ãƒ¡ãƒ¼ã‚¸ã‚’ãã®ã¾ã¾å‡ºåŠ› */
+ if( templateImage != NULL && templateID != templateImage->ID )
+ {
+ /* フラッグè¨å®š(æ£ã—ã„対象画åƒãŒå…¥åŠ›ï¼‰ */
+ flag = 1;
+ templateID = templateImage->ID;
+ templateWidth = templateImage->width;
+ templateHeight = templateImage->height;
+
+ if(templateGrayImage != NULL)
+ {
+ cvReleaseImage(&templateGrayImage);
+ cvReleaseImage(&templateBinaryImage);
+ }
+
+ /* 対象画åƒç”¨ã®ãƒ¡ãƒ¢ãƒªç¢ºä¿ */
+ templateGrayImage = cvCreateImage( cvGetSize(templateImage), IPL_DEPTH_8U, 1 );
+ templateBinaryImage = cvCreateImage( cvGetSize(templateImage), IPL_DEPTH_8U, 1 );
+
+ cout << "templateID : "<<templateID<<endl;
+ cout << "template - width :"<<templateWidth<<endl;
+ cout << "template - height :"<<templateHeight<<endl;
+
+ /* RGBã‹ã‚‰ã‚°ãƒ¬ãƒ¼ã‚¹ã‚±ãƒ¼ãƒ«ã«å¤‰æ›ã™ã‚‹ */
+ cvCvtColor( templateImage, templateGrayImage, CV_RGB2GRAY );
+
+ /* グレースケールã‹ã‚‰2値ã«å¤‰æ›ã™ã‚‹ */
+ cvThreshold( templateGrayImage, templateBinaryImage, THRESHOLD, THRESHOLD_MAX_VALUE, CV_THRESH_BINARY );
+
+ /* OutPort２用ã®ç”»é¢ã‚µã‚¤ã‚ºåˆæœŸåŒ– */
+ m_image_picture.width = templateImage->width;
+ m_image_picture.height = templateImage->height;
+ }
+
+ /* InPortã¨OutPortã®ç”»é¢ã‚µã‚¤ã‚ºå‡¦ç†ãŠã‚ˆã³ã‚¤ãƒ¡ãƒ¼ã‚¸ç”¨ãƒ¡ãƒ¢ãƒªã®ç¢ºä¿(æ£ã—ã„対象画åƒãŒå…¥ã‚Œã‚‹ã¨differenceMapImageãŒå¤‰æ›ã•ã‚Œã‚‹-フラッグを見ã¦åˆ¤æ–） */
+ if(m_image_orig.width != m_image_template.width || m_image_orig.height != m_image_template.height || flag == 1)
+ {
+ flag = 0;
+ m_image_template.width = m_image_orig.width;
+ m_image_template.height = m_image_orig.height;
+
+ /* InPortã®ã‚¤ãƒ¡ãƒ¼ã‚¸ã‚µã‚¤ã‚ºãŒå¤‰æ›´ã•ã‚ŒãŸå ´åˆ */
+ if(imageBuff != NULL)
+ {
+ cvReleaseImage(&imageBuff);
+ cvReleaseImage(&sourceGrayImage);
+ cvReleaseImage(&sourceBinaryImage);
+ cvReleaseImage(&differenceMapImage);
+ }
+ /* イメージ用メモリã®ç¢ºä¿ */
+ imageBuff = cvCreateImage( cvSize(m_image_orig.width, m_image_orig.height), IPL_DEPTH_8U, 3 );
+ sourceGrayImage = cvCreateImage( cvSize(m_image_orig.width, m_image_orig.height), IPL_DEPTH_8U, 1 );
+ sourceBinaryImage = cvCreateImage( cvSize(m_image_orig.width, m_image_orig.height), IPL_DEPTH_8U, 1 );
+ differenceMapImage = cvCreateImage( cvSize( m_image_orig.width - templateWidth + 1,
+ m_image_orig.height - templateHeight + 1 ), IPL_DEPTH_32F, 1 );
+ }
+
+ /* InPortã®ç”»åƒãƒ‡ãƒ¼ã‚¿ã‚’コピー */
+ memcpy( imageBuff->imageData, (void *)&(m_image_orig.pixels[0]), m_image_orig.pixels.length() );
+
+ if( templateImage != NULL )
+ {
+ /* RGBã‹ã‚‰ã‚°ãƒ¬ãƒ¼ã‚¹ã‚±ãƒ¼ãƒ«ã«å¤‰æ›ã™ã‚‹ */
+ cvCvtColor( imageBuff, sourceGrayImage, CV_RGB2GRAY );
+
+ /* グレースケールã‹ã‚‰2値ã«å¤‰æ›ã™ã‚‹ */
+ cvThreshold( sourceGrayImage, sourceBinaryImage, THRESHOLD, THRESHOLD_MAX_VALUE, CV_THRESH_BINARY );
+
+ /* テンプレートマッãƒãƒ³ã‚°ã‚’行ㆠ*/
+ cvMatchTemplate( sourceBinaryImage, templateBinaryImage, differenceMapImage, CV_TM_SQDIFF );
+
+ /* テンプレートãŒå…ƒç”»åƒã®ã©ã®éƒ¨åˆ†ã«ã‚ã‚‹ã®ã‹ã¨ã„ã†æƒ…å ±ã‚’å¾—ã‚‹ */
+ cvMinMaxLoc( differenceMapImage, NULL, NULL, &minLocation, NULL, NULL );
+
+ /* 一致ã™ã‚‹å ´æ‰€ã‚’元画åƒã«å››è§’ã§æã */
+ cvRectangle(
+ imageBuff,
+ minLocation,
+ cvPoint( minLocation.x + templateImage->width, minLocation.y + templateImage->height ),
+ CV_RGB( 255, 0, 0 ),
+ LINE_THICKNESS,
+ LINE_TYPE,
+ SHIFT
+ );
+
+ /* ç”»åƒãƒ‡ãƒ¼ã‚¿ã®ã‚µã‚¤ã‚ºå–å¾— */
+ len = imageBuff->nChannels * imageBuff->width * imageBuff->height;
+ m_image_template.pixels.length(len);
+
+ /* å転ã—ãŸç”»åƒãƒ‡ãƒ¼ã‚¿ã‚’OutPortã«ã‚³ãƒ”ー */
+ memcpy( (void *)&(m_image_template.pixels[0]), imageBuff->imageData, len );
+
+ /* å転ã—ãŸç”»åƒãƒ‡ãƒ¼ã‚¿ã‚’OutPortã‹ã‚‰å‡ºåŠ› */
+ m_image_templateOut.write();
+
+ /* 対象画åƒãƒ‡ãƒ¼ã‚¿ã®ã‚µã‚¤ã‚ºå–å¾— */
+ len = templateImage->nChannels * templateImage->width * templateImage->height;
+ m_image_picture.pixels.length(len);
+
+ /* å転ã—ãŸå¯¾è±¡ç”»åƒãƒ‡ãƒ¼ã‚¿ã‚’OutPortã«ã‚³ãƒ”ー */
+ memcpy( (void *)&(m_image_picture.pixels[0]), templateImage->imageData, len );
+
+ m_image_pictureOut.write();
+
+ }else{
+
+ /* ç”»åƒãƒ‡ãƒ¼ã‚¿ã®ã‚µã‚¤ã‚ºå–å¾— */
+ len = imageBuff->nChannels * imageBuff->width * imageBuff->height;
+ m_image_template.pixels.length(len);
+
+ /* å転ã—ãŸç”»åƒãƒ‡ãƒ¼ã‚¿ã‚’OutPortã«ã‚³ãƒ”ー */
+ memcpy( (void *)&(m_image_template.pixels[0]), imageBuff->imageData, len );
+
+ m_image_templateOut.write();
+
+ }
+
+ cvReleaseImage(&templateImage);
+ }
+ return RTC::RTC_OK;
+}
+
+/*
+RTC::ReturnCode_t Template::onAborting(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t Template::onError(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t Template::onReset(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t Template::onStateUpdate(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t Template::onRateChanged(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+
+
+extern "C"
+{
+
+ void TemplateInit(RTC::Manager* manager)
+ {
+ coil::Properties profile(template_spec);
+ manager->registerFactory(profile,
+ RTC::Create<Template>,
+ RTC::Delete<Template>);
+ }
+
+};
+
+
More information about the openrtm-commit
mailing list