[openrtm-commit:01364] r122 - in branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking: . cmake doc doc/content idl include/ObjectTracking src
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2014年 3月 17日 (月) 15:00:55 JST
Author: kawauchi
Date: 2014-03-17 15:00:55 +0900 (Mon, 17 Mar 2014)
New Revision: 122
Removed:
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/RTC.xml20130612093727
Modified:
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/ObjectTracking.conf
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/README.ObjectTracking
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/RTC.xml
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/cmake/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/cmake/cpack_options.cmake.in
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/cmake/wix.xsl.in
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/doc/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/doc/content/index.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/doc/content/index_j.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/idl/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/include/ObjectTracking/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/include/ObjectTracking/ObjectTracking.h
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/src/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/src/ObjectTracking.cpp
Log:
ObjectTracking : 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/ObjectTracking/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/CMakeLists.txt 2014-03-17 03:42:53 UTC (rev 121)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/CMakeLists.txt 2014-03-17 06:00:55 UTC (rev 122)
@@ -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(ObjectTracking)
+string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
+include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
+set(PROJECT_VERSION 1.1.0 CACHE STRING "ObjectTracking version")
+DISSECT_VERSION()
+set(PROJECT_DESCRIPTION "Objecttrack 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(ObjectTracking)
-string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
-include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.0.0 CACHE STRING "ObjectTracking version")
-DISSECT_VERSION()
-set(PROJECT_DESCRIPTION "Objecttrack 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/ObjectTracking/ObjectTracking.conf
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/ObjectTracking.conf 2014-03-17 03:42:53 UTC (rev 121)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/ObjectTracking.conf 2014-03-17 06:00:55 UTC (rev 122)
@@ -1,133 +1,139 @@
-# -*- sh -*-
-#------------------------------------------------------------
-# Configuration file for ObjectTracking
-#
-# This configuration file name should be specified in rtc.conf (or other
-# configuration file specified by -f option) by "config_file" property.
-#
-# Category.ObjectTracking.config_file: ObjectTracking.conf
-# or
-# Category.ObjectTracking0.config_file: ObjectTracking0.conf
-# Category.ObjectTracking1.config_file: ObjectTracking1.conf
-# Category.ObjectTracking2.config_file: ObjectTracking2.conf
-#
-# ------------------------------------------------------------
-# An example configuration file for ObjectTracking
-#
-# See details in the following reference manual
-#
-
-# Execution context configuration
-# exec_cxt.periodic.type: PeriodicExecutionContext
-# exec_cxt.periodic.rate: 1000
-#
-#
-# configuration.active_config: mode0
-
-# Additional configuration-set example named "mode0"
-#
-# conf.mode0.int_param0: 0
-# conf.mode0.int_param1: 1
-# conf.mode0.double_param0: 0.99
-# conf.mode0.double_param1: -0.99
-# conf.mode0.str_param0: default
-# conf.mode0.str_param1: default set in conf file
-# conf.mode0.vector_param0: 0.0,0.1,0.2,0.3,0.4,0.5,0.6
-#
-# Other configuration set named "mode1"
-#
-# conf.mode1.int_param0: 0
-# conf.mode1.int_param1: 1
-# conf.mode1.double_param0: 0.99
-# conf.mode1.double_param1: -0.99
-# conf.mode1.str_param0: default
-# conf.mode1.str_param1: default set in conf file
-# conf.mode1.vector_param0: 0.0,0.1,0.2,0.3,0.4,0.5,0.6
-
-
-
-
-
-##============================================================
-## Component configuration reference
-##
-
-##============================================================
-## Active configuration-set
-##============================================================
-##
-## Initial active configuration-set. The following "mode0" is a
-## configuration-set name. A configuration-set named "mode0" should be
-## appear in this configuration file as follows.
-##
-## configuration.active_config: mode0
-##
-# conf.mode0.param0: hoge
-# conf.mode0.param1: fuga
-# conf.mode0.param2: munya
-
-##============================================================
-## GUI control option for RTSystemEditor
-##============================================================
-## Available GUI control options [__widget__]:
-##
-## - text: text box [default].
-## - slider.<step>: Horizontal slider. <step> is step for the slider.
-## A range constraints option is required.
-## - spin: Spin button. A range constraitns option is required.
-## - radio: Radio button. An enumeration constraints is required.
-## - checkbox: Checkbox control. An enumeration constraints is
-## required. The parameter has to be able to accept a
-## comma separated list.
-## - orderd_list: Orderd list control. An enumeration constraint is
-## required. The parameter has to be able to accept a
-## comma separated list. In this control, Enumerated
-## elements can appear one or more times in the given list.
-##
-## Available GUI control constraint options [__constraints__]:
-##
-## - none: blank
-## - direct value: 100 (constant value)
-## - range: <, >, <=, >= can be used.
-## - enumeration: (enum0, enum1, ...)
-## - array: <constraints0>, ,constraints1>, ... for only array value
-## - hash: {key0: value0, key1:, value0, ...}
-##
-# conf.__widget__.image_height, text
-# conf.__widget__.image_width, text
-
-
-# conf.__constraints__.int_param0: 0<=x<=150
-# conf.__constraints__.int_param1: 0<=x<=1000
-# conf.__constraints__.double_param0: 0<=x<=100
-# conf.__constraints__.double_param1:
-# conf.__constraints__.str_param0: (default,mode0,mode1)
-# conf.__constraints__.vector_param0: (dog,monky,pheasant,cat)
-# conf.__constraints__.vector_param1: (pita,gora,switch)
-
-##============================================================
-## Execution context settings
-##============================================================
-##
-## Periodic type ExecutionContext
-##
-## Other availabilities in OpenRTM-aist
-##
-## - ExtTrigExecutionContext: External triggered EC. It is embedded in
-## OpenRTM library.
-## - OpenHRPExecutionContext: External triggred paralell execution
-## EC. It is embedded in OpenRTM
-## library. This is usually used with
-## OpenHRP3.
-## - RTPreemptEC: Real-time execution context for Linux
-## RT-preemptive pathed kernel.
-## - ArtExecutionContext: Real-time execution context for ARTLinux
-## (http://sourceforge.net/projects/art-linux/)
-##
-# exec_cxt.periodic.type: PeriodicExecutionContext
-
-##
-## The execution cycle of ExecutionContext
-##
-exec_cxt.periodic.rate:1000.0
-
+# -*- sh -*-
+#------------------------------------------------------------
+# Configuration file for ObjectTracking
+#
+# This configuration file name should be specified in rtc.conf (or other
+# configuration file specified by -f option) by "config_file" property.
+#
+# Category.ObjectTracking.config_file: ObjectTracking.conf
+# or
+# Category.ObjectTracking0.config_file: ObjectTracking0.conf
+# Category.ObjectTracking1.config_file: ObjectTracking1.conf
+# Category.ObjectTracking2.config_file: ObjectTracking2.conf
+#
+# ------------------------------------------------------------
+# An example configuration file for ObjectTracking
+#
+# See details in the following reference manual
+#
+
+# Execution context configuration
+# exec_cxt.periodic.type: PeriodicExecutionContext
+# exec_cxt.periodic.rate: 1000
+#
+#
+# configuration.active_config: mode0
+
+# Additional configuration-set example named "mode0"
+#
+# conf.mode0.int_param0: 0
+# conf.mode0.int_param1: 1
+# conf.mode0.double_param0: 0.99
+# conf.mode0.double_param1: -0.99
+# conf.mode0.str_param0: default
+# conf.mode0.str_param1: default set in conf file
+# conf.mode0.vector_param0: 0.0,0.1,0.2,0.3,0.4,0.5,0.6
+#
+# Other configuration set named "mode1"
+#
+# conf.mode1.int_param0: 0
+# conf.mode1.int_param1: 1
+# conf.mode1.double_param0: 0.99
+# conf.mode1.double_param1: -0.99
+# conf.mode1.str_param0: default
+# conf.mode1.str_param1: default set in conf file
+# conf.mode1.vector_param0: 0.0,0.1,0.2,0.3,0.4,0.5,0.6
+
+
+
+
+
+##============================================================
+## Component configuration reference
+##
+
+##============================================================
+## Active configuration-set
+##============================================================
+##
+## Initial active configuration-set. The following "mode0" is a
+## configuration-set name. A configuration-set named "mode0" should be
+## appear in this configuration file as follows.
+##
+## configuration.active_config: mode0
+##
+# conf.mode0.param0: hoge
+# conf.mode0.param1: fuga
+# conf.mode0.param2: munya
+
+##============================================================
+## GUI control option for RTSystemEditor
+##============================================================
+## Available GUI control options [__widget__]:
+##
+## - text: text box [default].
+## - slider.<step>: Horizontal slider. <step> is step for the slider.
+## A range constraints option is required.
+## - spin: Spin button. A range constraitns option is required.
+## - radio: Radio button. An enumeration constraints is required.
+## - checkbox: Checkbox control. An enumeration constraints is
+## required. The parameter has to be able to accept a
+## comma separated list.
+## - orderd_list: Orderd list control. An enumeration constraint is
+## required. The parameter has to be able to accept a
+## comma separated list. In this control, Enumerated
+## elements can appear one or more times in the given list.
+##
+## Available GUI control constraint options [__constraints__]:
+##
+## - none: blank
+## - direct value: 100 (constant value)
+## - range: <, >, <=, >= can be used.
+## - enumeration: (enum0, enum1, ...)
+## - array: <constraints0>, ,constraints1>, ... for only array value
+## - hash: {key0: value0, key1:, value0, ...}
+##
+## examples:
+# conf.__widget__.int_param0: slider.10
+# conf.__widget__.int_param1: spin
+# conf.__widget__.double_param0: slider.10
+# conf.__widget__.double_param1: text
+# conf.__widget__.str_param0: radio
+# conf.__widget__.vector_param0: checkbox
+# conf.__widget__.vector_param1: orderd_list
+
+
+# conf.__constraints__.int_param0: 0<=x<=150
+# conf.__constraints__.int_param1: 0<=x<=1000
+# conf.__constraints__.double_param0: 0<=x<=100
+# conf.__constraints__.double_param1:
+# conf.__constraints__.str_param0: (default,mode0,mode1)
+# conf.__constraints__.vector_param0: (dog,monky,pheasant,cat)
+# conf.__constraints__.vector_param1: (pita,gora,switch)
+
+##============================================================
+## Execution context settings
+##============================================================
+##
+## Periodic type ExecutionContext
+##
+## Other availabilities in OpenRTM-aist
+##
+## - ExtTrigExecutionContext: External triggered EC. It is embedded in
+## OpenRTM library.
+## - OpenHRPExecutionContext: External triggred paralell execution
+## EC. It is embedded in OpenRTM
+## library. This is usually used with
+## OpenHRP3.
+## - RTPreemptEC: Real-time execution context for Linux
+## RT-preemptive pathed kernel.
+## - ArtExecutionContext: Real-time execution context for ARTLinux
+## (http://sourceforge.net/projects/art-linux/)
+##
+# exec_cxt.periodic.type: PeriodicExecutionContext
+
+##
+## The execution cycle of ExecutionContext
+##
+exec_cxt.periodic.rate:1000.0
+
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/README.ObjectTracking
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/README.ObjectTracking 2014-03-17 03:42:53 UTC (rev 121)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/README.ObjectTracking 2014-03-17 06:00:55 UTC (rev 122)
@@ -1,224 +1,206 @@
-======================================================================
- RTComponent: ObjectTracking specificatioin
-
- OpenRTM-aist-1.0.0
- Date: $Date$
-
- This file is generated by rtc-template with the following argments.
-
-# rtc-template -bcxx --module-name=ObjectTracking
-# --module-desc='Objecttrack 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_height:int:240 --config=image_width:int:320
-# --inport=img_original:RTC::CameraImage --inport=m_event:RTC::TimedLong --inport=m_x:RTC::TimedLong --inport=m_y:RTC::TimedLong --outport=img_output:RTC::CameraImage --outport=img_hist:RTC::CameraImage
-
-
-======================================================================
- Basic Information
-======================================================================
-# <rtc-template block="module">
-Module Name: ObjectTracking
-Description: Objecttrack 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: img_original
- PortNumber: 0
- Description:
- PortType:
- DataType: RTC::CameraImage
- MaxOut:
- [Data Elements]
- Name:
- Type:
- Number:
- Semantics:
- Unit:
- Frequency:
- Operation Cycle:
- RangeLow:
- RangeHigh:
- DefaultValue:
-
- Name: m_event
- PortNumber: 1
- Description:
- PortType:
- DataType: RTC::TimedLong
- MaxOut:
- [Data Elements]
- Name:
- Type:
- Number:
- Semantics:
- Unit:
- Frequency:
- Operation Cycle:
- RangeLow:
- RangeHigh:
- DefaultValue:
-
- Name: m_x
- PortNumber: 2
- Description:
- PortType:
- DataType: RTC::TimedLong
- MaxOut:
- [Data Elements]
- Name:
- Type:
- Number:
- Semantics:
- Unit:
- Frequency:
- Operation Cycle:
- RangeLow:
- RangeHigh:
- DefaultValue:
-
- Name: m_y
- PortNumber: 3
- Description:
- PortType:
- DataType: RTC::TimedLong
- MaxOut:
- [Data Elements]
- Name:
- Type:
- Number:
- Semantics:
- Unit:
- Frequency:
- Operation Cycle:
- RangeLow:
- RangeHigh:
- DefaultValue:
-
-
-# </rtc-template>
-
-======================================================================
- OutPorts definition
-======================================================================
-# <rtc-template block="outport">
-
- Name: img_output
- PortNumber: 0
- Description:
- PortType:
- DataType: RTC::CameraImage
- MaxOut:
- [Data Elements]
- Name:
- Type:
- Number:
- Semantics:
- Unit:
- Frequency:
- Operation Cycle:
- RangeLow:
- RangeHigh:
- DefaultValue:
-
- Name: img_hist
- 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_height
- Description:
- Type: int
- DefaultValue: 240
- Unit:
- Range:
- Constraint:
-
- Name: image_width
- Description:
- Type: int
- DefaultValue: 320
- 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: ObjectTracking specificatioin
+
+ OpenRTM-aist-1.0.0
+ Date: $Date$
+
+ This file is generated by rtc-template with the following argments.
+
+# rtc-template -bcxx --module-name=ObjectTracking
+# --module-desc='Objecttrack component' --module-version=1.1.0 --module-vendor=AIST
+# --module-category=Category --module-comp-type=STATIC
+# --module-act-type=PERIODIC --module-max-inst=1
+# --inport=img_original:RTC::CameraImage --inport=m_event:RTC::TimedLong --inport=m_x:RTC::TimedLong --inport=m_y:RTC::TimedLong --outport=img_output:RTC::CameraImage --outport=img_hist:RTC::CameraImage
+
+
+======================================================================
+ Basic Information
+======================================================================
+# <rtc-template block="module">
+Module Name: ObjectTracking
+Description: Objecttrack 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: img_original
+ PortNumber: 0
+ Description:
+ PortType:
+ DataType: RTC::CameraImage
+ MaxOut:
+ [Data Elements]
+ Name:
+ Type:
+ Number:
+ Semantics:
+ Unit:
+ Frequency:
+ Operation Cycle:
+ RangeLow:
+ RangeHigh:
+ DefaultValue:
+
+ Name: m_event
+ PortNumber: 1
+ Description:
+ PortType:
+ DataType: RTC::TimedLong
+ MaxOut:
+ [Data Elements]
+ Name:
+ Type:
+ Number:
+ Semantics:
+ Unit:
+ Frequency:
+ Operation Cycle:
+ RangeLow:
+ RangeHigh:
+ DefaultValue:
+
+ Name: m_x
+ PortNumber: 2
+ Description:
+ PortType:
+ DataType: RTC::TimedLong
+ MaxOut:
+ [Data Elements]
+ Name:
+ Type:
+ Number:
+ Semantics:
+ Unit:
+ Frequency:
+ Operation Cycle:
+ RangeLow:
+ RangeHigh:
+ DefaultValue:
+
+ Name: m_y
+ PortNumber: 3
+ Description:
+ PortType:
+ DataType: RTC::TimedLong
+ MaxOut:
+ [Data Elements]
+ Name:
+ Type:
+ Number:
+ Semantics:
+ Unit:
+ Frequency:
+ Operation Cycle:
+ RangeLow:
+ RangeHigh:
+ DefaultValue:
+
+
+# </rtc-template>
+
+======================================================================
+ OutPorts definition
+======================================================================
+# <rtc-template block="outport">
+
+ Name: img_output
+ PortNumber: 0
+ Description:
+ PortType:
+ DataType: RTC::CameraImage
+ MaxOut:
+ [Data Elements]
+ Name:
+ Type:
+ Number:
+ Semantics:
+ Unit:
+ Frequency:
+ Operation Cycle:
+ RangeLow:
+ RangeHigh:
+ DefaultValue:
+
+ Name: img_hist
+ 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">
+# </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/ObjectTracking/RTC.xml
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/RTC.xml 2014-03-17 03:42:53 UTC (rev 121)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/RTC.xml 2014-03-17 06:00:55 UTC (rev 122)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:ObjectTracking: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="ObjectTracking" rtc:updateDate="2013-06-12T09:26:16+09:00" rtc:creationDate="2013-06-12T09:26:16+09:00" rtc:version="1.0.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Objecttrack component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="ObjectTracking"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:ObjectTracking: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="ObjectTracking" rtc:updateDate="2013-06-12T09:26:16+09:00" rtc:creationDate="2013-06-12T09:26:16+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Objecttrack component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="ObjectTracking"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
@@ -17,14 +17,6 @@
<rtc:OnAction xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
<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_height" rtc:unit="" rtc:defaultValue="240" rtc:type="int" rtc:name="image_height">
- <rtcExt:Properties rtcExt:value="text" rtcExt:name="__widget__"/>
- </rtc:Configuration>
- <rtc:Configuration xsi:type="rtcExt:configuration_ext" rtcExt:variableName="img_width" rtc:unit="" rtc:defaultValue="320" rtc:type="int" rtc:name="image_width">
- <rtcExt:Properties rtcExt:value="text" rtcExt:name="__widget__"/>
- </rtc:Configuration>
- </rtc:ConfigurationSet>
<rtc:DataPorts xsi:type="rtcExt:dataport_ext" rtcExt:position="LEFT" rtcExt:variableName="orig_img" rtc:unit="" rtc:subscriptionType="" rtc:dataflowType="" rtc:interfaceType="" rtc:idlFile="" rtc:type="RTC::CameraImage" rtc:name="img_original" rtc:portType="DataInPort"/>
<rtc:DataPorts xsi:type="rtcExt:dataport_ext" rtcExt:position="LEFT" rtcExt:variableName="event" rtc:unit="" rtc:subscriptionType="" rtc:dataflowType="" rtc:interfaceType="" rtc:idlFile="" rtc:type="RTC::TimedLong" rtc:name="m_event" rtc:portType="DataInPort"/>
<rtc:DataPorts xsi:type="rtcExt:dataport_ext" rtcExt:position="LEFT" rtcExt:variableName="x" rtc:unit="" rtc:subscriptionType="" rtc:dataflowType="" rtc:interfaceType="" rtc:idlFile="" rtc:type="RTC::TimedLong" rtc:name="m_x" rtc:portType="DataInPort"/>
Deleted: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/RTC.xml20130612093727
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/RTC.xml20130612093727 2014-03-17 03:42:53 UTC (rev 121)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/RTC.xml20130612093727 2014-03-17 06:00:55 UTC (rev 122)
@@ -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-12T09:26:16+09:00" rtc:creationDate="2013-06-12T09:26:16+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/ObjectTracking/cmake/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/cmake/CMakeLists.txt 2014-03-17 03:42:53 UTC (rev 121)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/cmake/CMakeLists.txt 2014-03-17 06:00:55 UTC (rev 122)
@@ -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/ObjectTracking/cmake/cpack_options.cmake.in
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/cmake/cpack_options.cmake.in 2014-03-17 03:42:53 UTC (rev 121)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/cmake/cpack_options.cmake.in 2014-03-17 06:00:55 UTC (rev 122)
@@ -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/ObjectTracking/cmake/wix.xsl.in
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/cmake/wix.xsl.in 2014-03-17 03:42:53 UTC (rev 121)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/cmake/wix.xsl.in 2014-03-17 06:00:55 UTC (rev 122)
@@ -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="D1F114C5-3FD9-437F-8B45-1395632AE782" Name="@CPACK_PACKAGE_NAME@ @CPACK_PACKAGE_VERSION@" Language="1041" Codepage="932" Version="@CPACK_PACKAGE_VERSION@" Manufacturer="@CPACK_PACKAGE_VENDOR@" UpgradeCode="36999B33-9A8B-49D5-8347-389A645301C8">
- <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="8518A72E-3054-42C2-AE2C-48A8897EB30A" Name="@CPACK_PACKAGE_NAME@ @CPACK_PACKAGE_VERSION@" Language="1041" Codepage="932" Version="@CPACK_PACKAGE_VERSION@" Manufacturer="@CPACK_PACKAGE_VENDOR@" UpgradeCode="D6C1B0C4-5C91-4976-A683-275F02808EE1">
+ <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/ObjectTracking/doc/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/doc/CMakeLists.txt 2014-03-17 03:42:53 UTC (rev 121)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/doc/CMakeLists.txt 2014-03-17 06:00:55 UTC (rev 122)
@@ -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/ObjectTracking/doc/content/index.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/doc/content/index.txt 2014-03-17 03:42:53 UTC (rev 121)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/doc/content/index.txt 2014-03-17 06:00:55 UTC (rev 122)
@@ -1,147 +1,145 @@
-ObjectTrackingName - 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
-============
-
-ObjectTracking 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
-``ObjectTrackingComp`` executable. The ``ObjectTracking`` library
-is available for loading into a manager, using the initialisation function
-``ObjectTrackingInit``.
-
-From source
------------
-
-Follow these steps to install ObjectTracking from source in any operating
-system:
-
-- Download the source, either from the repository or a source archive,
- and extract it somewhere::
-
- tar -xvzf ObjectTracking-1.0.0.tar.gz
-
-- Change to the directory containing the extracted source::
-
- cd ObjectTracking-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.
-
-ObjectTracking can be launched in stand-alone mode by executing the
-``ObjectTrackingComp`` executable (installed into ``${prefix}/components/bin``).
-Alternatively, ``libObjectTracking.so`` can be loaded into a manager, using the
-initialisation function ``ObjectTrackingInit``. 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_height int 240
-image_width int 320
-================ ================== ================ ======
-
-Ports
-=====
-
-The ports provided by the component are described below:
-
-=============== =========== ============================== =======
-Name Type Data type Purpose
-=============== =========== ============================== =======
-img_original InPort RTC::CameraImage
-m_event InPort RTC::TimedLong
-m_x InPort RTC::TimedLong
-m_y InPort RTC::TimedLong
-img_output OutPort RTC::CameraImage
-img_hist OutPort RTC::CameraImage
-=============== =========== ============================== =======
-
-Examples
-========
-
-An example configuration file is provided in the
-``${prefix}/components/share/ObjectTracking/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.
-
+ObjectTrackingName - 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
+============
+
+ObjectTracking 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
+``ObjectTrackingComp`` executable. The ``ObjectTracking`` library
+is available for loading into a manager, using the initialisation function
+``ObjectTrackingInit``.
+
+From source
+-----------
+
+Follow these steps to install ObjectTracking from source in any operating
+system:
+
+- Download the source, either from the repository or a source archive,
+ and extract it somewhere::
+
+ tar -xvzf ObjectTracking-1.0.0.tar.gz
+
+- Change to the directory containing the extracted source::
+
+ cd ObjectTracking-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.
+
+ObjectTracking can be launched in stand-alone mode by executing the
+``ObjectTrackingComp`` executable (installed into ``${prefix}/components/bin``).
+Alternatively, ``libObjectTracking.so`` can be loaded into a manager, using the
+initialisation function ``ObjectTrackingInit``. 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
+================ ================== ================ ======
+================ ================== ================ ======
+
+Ports
+=====
+
+The ports provided by the component are described below:
+
+=============== =========== ============================== =======
+Name Type Data type Purpose
+=============== =========== ============================== =======
+img_original InPort RTC::CameraImage
+m_event InPort RTC::TimedLong
+m_x InPort RTC::TimedLong
+m_y InPort RTC::TimedLong
+img_output OutPort RTC::CameraImage
+img_hist OutPort RTC::CameraImage
+=============== =========== ============================== =======
+
+Examples
+========
+
+An example configuration file is provided in the
+``${prefix}/components/share/ObjectTracking/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/ObjectTracking/doc/content/index_j.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/doc/content/index_j.txt 2014-03-17 03:42:53 UTC (rev 121)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/doc/content/index_j.txt 2014-03-17 06:00:55 UTC (rev 122)
@@ -1,137 +1,135 @@
-ObjectTracking - 日本語
-=======================
-
-
-ã¯ã˜ã‚ã«
-========
-
-クラスã«ã¤ã„ã¦ã¯ã€ `APIドã‚ュメンテーション`_ ã«å‚ç…§ã—ã¦ãã ã•ã„。
-
-.. _`APIドã‚ュメンテーション`:
- doxygen/html/index.html
-
-æ¡ä»¶
-====
-
-ObjectTrackingã¯OpenRTM-aist 1.0.0以上ã®C++版ãŒå¿…è¦ã§ã™ã€‚
-
-ObjectTracking㯠CMake_ を使ã„ã¾ã™ã€‚CMake 2.8以上ãŒå¿…è¦ã§ã™ã€‚
-
-.. _CMAke:
- http://www.cmake.org
-
-インストール
-============
-
-インストーラ
-------------
-
-Windowsã®ãƒ¦ãƒ¼ã‚¶ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ãƒ‘ッケージを使用ã—ã¦ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’インストール
-ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã“ã‚Œã¯ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆåŠã³ãã®ã™ã¹ã¦ã®å¿…è¦ãªãƒ©ã‚¤ãƒ–ラリを
-インストールã—ã¾ã™ã€‚Windowsã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹å ´åˆã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ã®ä½¿ç”¨ã‚’推奨ã—ã¦ã¾ã™ã€‚
-
-- インストーラをダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã•ã„。
-- インストールを始ã‚ã‚‹ãŸã‚ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ã‚’ダブルクリックã—ã¦ãã ã•ã„。
-- 指示ã«ã—ãŸãŒã£ã¦ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’インストールã—ã¦ãã ã•ã„。
-- 環境変数ã®å¤‰æ›´ã‚’é©ç”¨ã™ã‚‹ãŸã‚ã€ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’使用ã™ã‚‹å‰ã«ã‚³ãƒ³ãƒ”ューターを
- å†èµ·å‹•ã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。
-
-ObjectTracking㯠``ObjectTrackingComp`` ã®å®Ÿè¡Œã‚’ダブルクリックã—ã¦å®Ÿè¡Œã™ã‚‹ã“ã¨ãŒ
-ã§ãã¾ã™ã€‚ã‚ã‚‹ã„ã¯ã€ ``ObjectTracking`` ã‚’åˆæœŸåŒ–関数㮠``ObjectTrackingInit`` を利用ã—ã¦ã€
-マãƒãƒ¼ã‚¸ãƒ£ã«ãƒãƒ¼ãƒ‰ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
-
-ソースã‹ã‚‰
-----------
-
-ソースを使ã†å ´åˆã¯ä»¥ä¸‹ã®æ‰‹é †ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•ã„。
-
-- ソースをダウンãƒãƒ¼ãƒ‰ã—ã¦è§£å‡ã—ã¦ãã ã•ã„::
-
- tar -xvzf ObjectTracking-1.0.0.tar.gz
-
-- 解å‡ã•ã‚ŒãŸãƒ•ã‚©ãƒ«ãƒ€ã«å…¥ã£ã¦ãã ã•ã„::
-
- cd ObjectTracking-1.0.0
-
-- ``build`` フォルダを作ã£ã¦ãã ã•ã„::
-
- mkdir build
-
-- `` build`` フォルダã«å…¥ã£ã¦ãã ã•ã„::
-
- cd build
-
-- CMakeを実行ã—ã¦ãã ã•ã„::
-
- cmake ../
-
-- エラーãŒå‡ºç„¡ã„å ´åˆã€makeを実行ã—ã¦ãã ã•ã„::
-
- make
-
-- ``make install`` ã§ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’インストールã—ã¦ãã ã•ã„。é¸æŠžã•ã‚ŒãŸ
- ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å ´æ‰€ã«æ›¸ãè¾¼ã¿æ¨©é™ãŒã‚ã‚‹ã‹ã‚’確èªã—ã¦ãã ã•ã„::
-
- ``make install``
-
-- インストールã™ã‚‹å ´æ‰€ã¯ccmakeを実行ã—㦠``CMAKE_INSTALL_PREFIX`` ã‚’
- è¨å®šã™ã‚‹ã“ã¨ã§å¤‰æ›´ãŒå¯èƒ½ã§ã™ã€‚
-
- ccmake ../
-
-ã“ã“ã¾ã§ã§ã€ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆãŒä½¿ãˆã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã—ãŸã€‚コンフィグレーションã¯æ¬¡ã®ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã‚’
-å‚ç…§ã—ã¦ãã ã•ã„。
-
-ObjectTracking㯠``ObjectTrackingComp`` を実行（ ``${prefix}/components/bin`` ã«
-インストールã•ã‚Œã¾ã™ï¼‰ã™ã‚‹ã“ã¨ã§ã‚¹ã‚¿ãƒ³ãƒ‰ã‚¢ãƒãƒ¼ãƒ³ãƒ¢ãƒ¼ãƒ‰ã§å®Ÿè¡Œã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
-ã‚ã‚‹ã„ã¯ã€ ``libObjectTracking.so`` ã‚’åˆæœŸåŒ–関数㮠``ObjectTrackingInit`` を利用ã—ã¦ã€
-マãƒãƒ¼ã‚¸ãƒ£ã«ãƒãƒ¼ãƒ‰ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã“ã®ãƒ©ã‚¤ãƒ–ラリ㯠``${prefix}/components/lib``
-ã¾ãŸã¯ ``${prefix}/components/lib64`` ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™ã€‚
-
-
-コンフィグレーション
-====================
-
-使ãˆã‚‹ã‚³ãƒ³ãƒ•ã‚£ã‚°ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ãƒ‘ラメータã¯ä»¥ä¸‹ã®ãƒ†ãƒ¼ãƒ–ルをå‚ç…§
-ã—ã¦ãã ã•ã„。
-
-================ ================== ================ ====
-パラメータ データ型 デフォルト値 æ„味
-================ ================== ================ ====
-image_height int 240
-image_width int 320
-================ ================== ================ ====
-
-ãƒãƒ¼ãƒˆ
-======
-
-コンãƒãƒ¼ãƒãƒ³ãƒˆã«ã‚ˆã£ã¦æä¾›ã•ã‚Œã‚‹ãƒãƒ¼ãƒˆã¯ä»¥ä¸‹ã®ãƒ†ãƒ¼ãƒ–ルã§è¿°ã¹ã‚‰ã‚Œã¦ã„ã¾ã™ã€‚
-
-=============== =========== ============================== ====
-ãƒãƒ¼ãƒˆå ãƒãƒ¼ãƒˆåž‹ データ型 æ„味
-=============== =========== ============================== ====
-img_original InPort RTC::CameraImage
-m_event InPort RTC::TimedLong
-m_x InPort RTC::TimedLong
-m_y InPort RTC::TimedLong
-img_output OutPort RTC::CameraImage
-img_hist OutPort RTC::CameraImage
-=============== =========== ============================== ====
-
-例
-==
-
-例ã®rtc.confファイル㯠``${prefix}/components/share/ObjectTracking/examples/conf/``
-フォルダã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™ã€‚
-
-Changelog
-=========
-
-
-License
-=======
-
-ã“ã®ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¯ç”£æ¥æŠ€è¡“ç·åˆç ”究所ã§é–‹ç™ºã•ã‚Œã¦ã„ã¾ã™ã€‚承èªç•ªå·ã¯H23PRO-????
-ã§ã™ã€‚ã“ã®ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¯ Lesser General Public License (LGPL) ライセンスã¨ã—ã¦
-公開ã•ã‚Œã¦ã¾ã™ã€‚COPYING.LESSER ã‚’å‚ç…§ã—ã¦ãã ã•ã„。
-
+ObjectTracking - 日本語
+=======================
+
+
+ã¯ã˜ã‚ã«
+========
+
+クラスã«ã¤ã„ã¦ã¯ã€ `APIドã‚ュメンテーション`_ ã«å‚ç…§ã—ã¦ãã ã•ã„。
+
+.. _`APIドã‚ュメンテーション`:
+ doxygen/html/index.html
+
+æ¡ä»¶
+====
+
+ObjectTrackingã¯OpenRTM-aist 1.0.0以上ã®C++版ãŒå¿…è¦ã§ã™ã€‚
+
+ObjectTracking㯠CMake_ を使ã„ã¾ã™ã€‚CMake 2.8以上ãŒå¿…è¦ã§ã™ã€‚
+
+.. _CMAke:
+ http://www.cmake.org
+
+インストール
+============
+
+インストーラ
+------------
+
+Windowsã®ãƒ¦ãƒ¼ã‚¶ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ãƒ‘ッケージを使用ã—ã¦ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’インストール
+ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã“ã‚Œã¯ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆåŠã³ãã®ã™ã¹ã¦ã®å¿…è¦ãªãƒ©ã‚¤ãƒ–ラリを
+インストールã—ã¾ã™ã€‚Windowsã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹å ´åˆã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ã®ä½¿ç”¨ã‚’推奨ã—ã¦ã¾ã™ã€‚
+
+- インストーラをダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã•ã„。
+- インストールを始ã‚ã‚‹ãŸã‚ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ã‚’ダブルクリックã—ã¦ãã ã•ã„。
+- 指示ã«ã—ãŸãŒã£ã¦ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’インストールã—ã¦ãã ã•ã„。
+- 環境変数ã®å¤‰æ›´ã‚’é©ç”¨ã™ã‚‹ãŸã‚ã€ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’使用ã™ã‚‹å‰ã«ã‚³ãƒ³ãƒ”ューターを
+ å†èµ·å‹•ã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。
+
+ObjectTracking㯠``ObjectTrackingComp`` ã®å®Ÿè¡Œã‚’ダブルクリックã—ã¦å®Ÿè¡Œã™ã‚‹ã“ã¨ãŒ
+ã§ãã¾ã™ã€‚ã‚ã‚‹ã„ã¯ã€ ``ObjectTracking`` ã‚’åˆæœŸåŒ–関数㮠``ObjectTrackingInit`` を利用ã—ã¦ã€
+マãƒãƒ¼ã‚¸ãƒ£ã«ãƒãƒ¼ãƒ‰ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
+
+ソースã‹ã‚‰
+----------
+
+ソースを使ã†å ´åˆã¯ä»¥ä¸‹ã®æ‰‹é †ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•ã„。
+
+- ソースをダウンãƒãƒ¼ãƒ‰ã—ã¦è§£å‡ã—ã¦ãã ã•ã„::
+
+ tar -xvzf ObjectTracking-1.0.0.tar.gz
+
+- 解å‡ã•ã‚ŒãŸãƒ•ã‚©ãƒ«ãƒ€ã«å…¥ã£ã¦ãã ã•ã„::
+
+ cd ObjectTracking-1.0.0
+
+- ``build`` フォルダを作ã£ã¦ãã ã•ã„::
+
+ mkdir build
+
+- `` build`` フォルダã«å…¥ã£ã¦ãã ã•ã„::
+
+ cd build
+
+- CMakeを実行ã—ã¦ãã ã•ã„::
+
+ cmake ../
+
+- エラーãŒå‡ºç„¡ã„å ´åˆã€makeを実行ã—ã¦ãã ã•ã„::
+
+ make
+
+- ``make install`` ã§ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’インストールã—ã¦ãã ã•ã„。é¸æŠžã•ã‚ŒãŸ
+ ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å ´æ‰€ã«æ›¸ãè¾¼ã¿æ¨©é™ãŒã‚ã‚‹ã‹ã‚’確èªã—ã¦ãã ã•ã„::
+
+ ``make install``
+
+- インストールã™ã‚‹å ´æ‰€ã¯ccmakeを実行ã—㦠``CMAKE_INSTALL_PREFIX`` ã‚’
+ è¨å®šã™ã‚‹ã“ã¨ã§å¤‰æ›´ãŒå¯èƒ½ã§ã™ã€‚
+
+ ccmake ../
+
+ã“ã“ã¾ã§ã§ã€ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆãŒä½¿ãˆã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã—ãŸã€‚コンフィグレーションã¯æ¬¡ã®ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã‚’
+å‚ç…§ã—ã¦ãã ã•ã„。
+
+ObjectTracking㯠``ObjectTrackingComp`` を実行（ ``${prefix}/components/bin`` ã«
+インストールã•ã‚Œã¾ã™ï¼‰ã™ã‚‹ã“ã¨ã§ã‚¹ã‚¿ãƒ³ãƒ‰ã‚¢ãƒãƒ¼ãƒ³ãƒ¢ãƒ¼ãƒ‰ã§å®Ÿè¡Œã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
+ã‚ã‚‹ã„ã¯ã€ ``libObjectTracking.so`` ã‚’åˆæœŸåŒ–関数㮠``ObjectTrackingInit`` を利用ã—ã¦ã€
+マãƒãƒ¼ã‚¸ãƒ£ã«ãƒãƒ¼ãƒ‰ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã“ã®ãƒ©ã‚¤ãƒ–ラリ㯠``${prefix}/components/lib``
+ã¾ãŸã¯ ``${prefix}/components/lib64`` ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™ã€‚
+
+
+コンフィグレーション
+====================
+
+使ãˆã‚‹ã‚³ãƒ³ãƒ•ã‚£ã‚°ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ãƒ‘ラメータã¯ä»¥ä¸‹ã®ãƒ†ãƒ¼ãƒ–ルをå‚ç…§
+ã—ã¦ãã ã•ã„。
+
+================ ================== ================ ====
+パラメータ データ型 デフォルト値 æ„味
+================ ================== ================ ====
+================ ================== ================ ====
+
+ãƒãƒ¼ãƒˆ
+======
+
+コンãƒãƒ¼ãƒãƒ³ãƒˆã«ã‚ˆã£ã¦æä¾›ã•ã‚Œã‚‹ãƒãƒ¼ãƒˆã¯ä»¥ä¸‹ã®ãƒ†ãƒ¼ãƒ–ルã§è¿°ã¹ã‚‰ã‚Œã¦ã„ã¾ã™ã€‚
+
+=============== =========== ============================== ====
+ãƒãƒ¼ãƒˆå ãƒãƒ¼ãƒˆåž‹ データ型 æ„味
+=============== =========== ============================== ====
+img_original InPort RTC::CameraImage
+m_event InPort RTC::TimedLong
+m_x InPort RTC::TimedLong
+m_y InPort RTC::TimedLong
+img_output OutPort RTC::CameraImage
+img_hist OutPort RTC::CameraImage
+=============== =========== ============================== ====
+
+例
+==
+
+例ã®rtc.confファイル㯠``${prefix}/components/share/ObjectTracking/examples/conf/``
+フォルダã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™ã€‚
+
+Changelog
+=========
+
+
+License
+=======
+
+ã“ã®ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¯ç”£æ¥æŠ€è¡“ç·åˆç ”究所ã§é–‹ç™ºã•ã‚Œã¦ã„ã¾ã™ã€‚承èªç•ªå·ã¯H23PRO-????
+ã§ã™ã€‚ã“ã®ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¯ Lesser General Public License (LGPL) ライセンスã¨ã—ã¦
+公開ã•ã‚Œã¦ã¾ã™ã€‚COPYING.LESSER ã‚’å‚ç…§ã—ã¦ãã ã•ã„。
+
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/idl/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/idl/CMakeLists.txt 2014-03-17 03:42:53 UTC (rev 121)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/idl/CMakeLists.txt 2014-03-17 06:00:55 UTC (rev 122)
@@ -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/ObjectTracking/include/ObjectTracking/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/include/ObjectTracking/CMakeLists.txt 2014-03-17 03:42:53 UTC (rev 121)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/include/ObjectTracking/CMakeLists.txt 2014-03-17 06:00:55 UTC (rev 122)
@@ -1,7 +1,7 @@
set(hdrs ObjectTracking.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/ObjectTracking/include/ObjectTracking/ObjectTracking.h
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/include/ObjectTracking/ObjectTracking.h 2014-03-17 03:42:53 UTC (rev 121)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/include/ObjectTracking/ObjectTracking.h 2014-03-17 06:00:55 UTC (rev 122)
@@ -1,335 +1,323 @@
-// -*- C++ -*-
-/*!
- * @file ObjectTracking.h
- * @brief Objecttrack component
- * @date $Date$
- *
- * $Id$
- */
-
-#ifndef OBJECTTRACKING_H
-#define OBJECTTRACKING_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>
-
-#include <cv.h>
-#include <cvaux.h>
-#include <highgui.h>
-
-#define SEGMENT 150 // cvSnakeImage‚Å—p‚¢‚駌ä“_‚Ì”
-#define WINDOW_WIDTH 17 // cvSnakeImage‚ÅŬ’l‚ð’Tõ‚·‚é‹ß–T—̈æ‚Ì•
-#define WINDOW_HEIGHT 17 // cvSnakeImage‚ÅŬ’l‚ð’Tõ‚·‚é‹ß–T—̈æ‚Ì‚‚³
-#define HISTIMAGE_WIDTH 320 // ƒqƒXƒgƒOƒ‰ƒ€‰æ‘œ‚Ì•
-#define HISTIMAGE_HEIGHT 200 // ƒqƒXƒgƒOƒ‰ƒ€‰æ‘œ‚Ì‚‚³
-#define H_DIMENSION 16 // ƒqƒXƒgƒOƒ‰ƒ€‚ÌŽŸŒ³”
-#define H_RANGE_MIN 0
-#define H_RANGE_MAX 180
-#define V_MIN 10 // –¾“x‚ÌŬ’l
-#define V_MAX 256 // –¾“x‚ÌÅ‘å’l
-#define S_MIN 30 // Ê“x‚ÌŬ’l
-#define S_MAX 256 // Ê“x‚ÌŬ’l
-#define HIDDEN_BACKPROJECTION 0 // ƒoƒbƒNƒvƒƒWƒFƒNƒVƒ‡ƒ“‰æ‘œ‚ð•\Ž¦‚³‚¹‚È‚¢ƒtƒ‰ƒO’l
-#define SHOW_BACKPROJECTION 1 // ƒoƒbƒNƒvƒƒWƒFƒNƒVƒ‡ƒ“‰æ‘œ‚ð•\Ž¦‚³‚¹‚éƒtƒ‰ƒO’l
-#define SELECT_OFF 0 // ‰Šú’Ç՗̈悪ݒ肳‚ê‚Ä‚¢‚È‚¢‚Æ‚«‚̃tƒ‰ƒO’l
-#define SELECT_ON 1 // ‰Šú’Ç՗̈悪ݒ肳‚ê‚Ä‚¢‚é‚Æ‚«‚̃tƒ‰ƒO’l
-#define TRACKING_STOP 0 // ƒgƒ‰ƒbƒLƒ“ƒO‚ðŽ~‚ß‚éƒtƒ‰ƒO’l
-#define TRACKING_START -1 // ƒgƒ‰ƒbƒLƒ“ƒO‚ðŠJŽn‚·‚éƒtƒ‰ƒO’l
-#define TRACKING_NOW 1 // ƒgƒ‰ƒbƒLƒ“ƒO’†‚ðŽ¦‚·ƒtƒ‰ƒO’l
-#define HIDDEN_HISTOGRAM 0 // ƒqƒXƒgƒOƒ‰ƒ€‚ð•\Ž¦‚³‚¹‚È‚¢ƒtƒ‰ƒO’l
-#define SHOW_HISTOGRAM 1 // ƒqƒXƒgƒOƒ‰ƒ€‚ð•\Ž¦‚³‚¹‚éƒtƒ‰ƒO’l
-#define ITERATION_SNAKE 10 // cvSnakeImage‚Ì”½•œ‰ñ”
-
-// 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 ObjectTracking
- * @brief Objecttrack component
- *
- */
-class ObjectTracking
- : public RTC::DataFlowComponentBase
-{
- public:
- /*!
- * @brief constructor
- * @param manager Maneger Object
- */
- ObjectTracking(RTC::Manager* manager);
-
- /*!
- * @brief destructor
- */
- ~ObjectTracking();
-
- // <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_height
- * - DefaultValue: 240
- */
- int m_img_height;
- /*!
- *
- * - Name: img_width
- * - DefaultValue: 320
- */
- int m_img_width;
-
- // </rtc-template>
-
- // DataInPort declaration
- // <rtc-template block="inport_declare">
- RTC::CameraImage m_orig_img;
- /*!
- */
- InPort<RTC::CameraImage> m_orig_imgIn;
- RTC::TimedLong m_event;
- /*!
- */
- InPort<RTC::TimedLong> m_eventIn;
- RTC::TimedLong m_x;
- /*!
- */
- InPort<RTC::TimedLong> m_xIn;
- RTC::TimedLong m_y;
- /*!
- */
- InPort<RTC::TimedLong> m_yIn;
-
- // </rtc-template>
-
-
- // DataOutPort declaration
- // <rtc-template block="outport_declare">
- RTC::CameraImage m_out_img;
- /*!
- */
- OutPort<RTC::CameraImage> m_out_imgOut;
- RTC::CameraImage m_hist_img;
- /*!
- */
- OutPort<RTC::CameraImage> m_hist_imgOut;
-
- // </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>
-
-};
-
-
-extern "C"
-{
- DLL_EXPORT void ObjectTrackingInit(RTC::Manager* manager);
-};
-
-#endif // OBJECTTRACKING_H
+// -*- C++ -*-
+/*!
+ * @file ObjectTracking.h
+ * @brief Objecttrack component
+ * @date $Date$
+ *
+ * $Id$
+ */
+
+#ifndef OBJECTTRACKING_H
+#define OBJECTTRACKING_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>
+
+#include <cv.h>
+#include <cvaux.h>
+#include <highgui.h>
+
+#define SEGMENT 150 /* cvSnakeImageã§ç”¨ã„る制御点ã®æ•° */
+#define WINDOW_WIDTH 17 /* cvSnakeImageã§æœ€å°å€¤ã‚’探索ã™ã‚‹è¿‘å‚é ˜åŸŸã®å¹… */
+#define WINDOW_HEIGHT 17 /* cvSnakeImageã§æœ€å°å€¤ã‚’探索ã™ã‚‹è¿‘å‚é ˜åŸŸã®é«˜ã• */
+#define HISTIMAGE_WIDTH 320 /* ヒストグラム画åƒã®å¹… */
+#define HISTIMAGE_HEIGHT 200 /* ヒストグラム画åƒã®é«˜ã• */
+#define H_DIMENSION 16 /* ヒストグラムã®æ¬¡å…ƒæ•° */
+#define H_RANGE_MIN 0
+#define H_RANGE_MAX 180
+#define V_MIN 10 /* 明度ã®æœ€å°å€¤ */
+#define V_MAX 256 /* 明度ã®æœ€å¤§å€¤ */
+#define S_MIN 30 /* 彩度ã®æœ€å°å€¤ */
+#define S_MAX 256 /* 彩度ã®æœ€å°å€¤ */
+#define HIDDEN_BACKPROJECTION 0 /* ãƒãƒƒã‚¯ãƒ—ãƒã‚¸ã‚§ã‚¯ã‚·ãƒ§ãƒ³ç”»åƒã‚’表示ã•ã›ãªã„フラグ値 */
+#define SHOW_BACKPROJECTION 1 /* ãƒãƒƒã‚¯ãƒ—ãƒã‚¸ã‚§ã‚¯ã‚·ãƒ§ãƒ³ç”»åƒã‚’表示ã•ã›ã‚‹ãƒ•ãƒ©ã‚°å€¤ */
+#define SELECT_OFF 0 /* åˆæœŸè¿½è·¡é ˜åŸŸãŒè¨å®šã•ã‚Œã¦ã„ãªã„ã¨ãã®ãƒ•ãƒ©ã‚°å€¤ */
+#define SELECT_ON 1 /* åˆæœŸè¿½è·¡é ˜åŸŸãŒè¨å®šã•ã‚Œã¦ã„ã‚‹ã¨ãã®ãƒ•ãƒ©ã‚°å€¤ */
+#define TRACKING_STOP 0 /* トラッã‚ングをæ¢ã‚るフラグ値 */
+#define TRACKING_START -1 /* トラッã‚ングを開始ã™ã‚‹ãƒ•ãƒ©ã‚°å€¤ */
+#define TRACKING_NOW 1 /* トラッã‚ングä¸ã‚’示ã™ãƒ•ãƒ©ã‚°å€¤ */
+#define HIDDEN_HISTOGRAM 0 /* ヒストグラムを表示ã•ã›ãªã„フラグ値 */
+#define SHOW_HISTOGRAM 1 /* ヒストグラムを表示ã•ã›ã‚‹ãƒ•ãƒ©ã‚°å€¤ */
+#define ITERATION_SNAKE 10 /* cvSnakeImageã®å復回数 */
+
+// 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 ObjectTracking
+ * @brief Objecttrack component
+ *
+ */
+class ObjectTracking
+ : public RTC::DataFlowComponentBase
+{
+ public:
+ /*!
+ * @brief constructor
+ * @param manager Maneger Object
+ */
+ ObjectTracking(RTC::Manager* manager);
+
+ /*!
+ * @brief destructor
+ */
+ ~ObjectTracking();
+
+ // <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">
+
+ // </rtc-template>
+
+ // DataInPort declaration
+ // <rtc-template block="inport_declare">
+ RTC::CameraImage m_orig_img;
+ /*!
+ */
+ InPort<RTC::CameraImage> m_orig_imgIn;
+ RTC::TimedLong m_event;
+ /*!
+ */
+ InPort<RTC::TimedLong> m_eventIn;
+ RTC::TimedLong m_x;
+ /*!
+ */
+ InPort<RTC::TimedLong> m_xIn;
+ RTC::TimedLong m_y;
+ /*!
+ */
+ InPort<RTC::TimedLong> m_yIn;
+
+ // </rtc-template>
+
+
+ // DataOutPort declaration
+ // <rtc-template block="outport_declare">
+ RTC::CameraImage m_out_img;
+ /*!
+ */
+ OutPort<RTC::CameraImage> m_out_imgOut;
+ RTC::CameraImage m_hist_img;
+ /*!
+ */
+ OutPort<RTC::CameraImage> m_hist_imgOut;
+
+ // </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>
+
+};
+
+
+extern "C"
+{
+ DLL_EXPORT void ObjectTrackingInit(RTC::Manager* manager);
+};
+
+#endif // OBJECTTRACKING_H
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/src/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/src/CMakeLists.txt 2014-03-17 03:42:53 UTC (rev 121)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/src/CMakeLists.txt 2014-03-17 06:00:55 UTC (rev 122)
@@ -1,63 +1,69 @@
-set(comp_srcs ObjectTracking.cpp )
-set(standalone_srcs ObjectTrackingComp.cpp)
-
+set(comp_srcs ObjectTracking.cpp )
+set(standalone_srcs ObjectTrackingComp.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/ObjectTracking/src/ObjectTracking.cpp
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/src/ObjectTracking.cpp 2014-03-17 03:42:53 UTC (rev 121)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ObjectTracking/src/ObjectTracking.cpp 2014-03-17 06:00:55 UTC (rev 122)
@@ -1,656 +1,636 @@
-// -*- C++ -*-
-/*!
- * @file ObjectTracking.cpp
- * @brief Objecttrack component
- * @date $Date$
- *
- * $Id$
- */
-
-#include "ObjectTracking.h"
-
-// Module specification
-// <rtc-template block="module_spec">
-static const char* objecttracking_spec[] =
- {
- "implementation_id", "ObjectTracking",
- "type_name", "ObjectTracking",
- "description", "Objecttrack 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_height", "240",
- "conf.default.image_width", "320",
- // Widget
- "conf.__widget__.image_height", "text",
- "conf.__widget__.image_width", "text",
- // Constraints
- ""
- };
-// </rtc-template>
-
-IplImage *inputImage = NULL; //“ü—Í‚³‚ꂽIplImage
-IplImage *resultImage = NULL; // ˆ—Œ‹‰Ê•\Ž¦—pIplImage
-IplImage *hsvImage = NULL; // HSV•\FŒn—pIplImage
-IplImage *hueImage = NULL; // HSV•\FŒn‚ÌHƒ`ƒƒƒ“ƒlƒ‹—pIplImage
-IplImage *maskImage = NULL; // ƒ}ƒXƒN‰æ‘œ—pIplImage
-IplImage *backprojectImage = NULL; // ƒoƒbƒNƒvƒƒWƒFƒNƒVƒ‡ƒ“‰æ‘œ—pIplImage
-IplImage *histImage = NULL; // ƒqƒXƒgƒOƒ‰ƒ€•`‰æ—pIplImage
-IplImage *grayImage = NULL; // ƒOƒŒ[ƒXƒP[ƒ‹‰æ‘œ—pIplImage
-
-CvHistogram *hist = NULL; // ƒqƒXƒgƒOƒ‰ƒ€ˆ——p\‘¢‘Ì
-
-IplImage *frameImage; // ƒLƒƒƒvƒ`ƒƒ‰æ‘œ—pIplImage
-CvCapture *capture; // ƒL[“ü—ÍŒ‹‰Ê‚ðŠi”[‚·‚é•Ï”
-int count = 0;
-int g_temp_w = 0;
-int g_temp_h = 0;
-
-// ˆ—ƒ‚[ƒh‘I‘ð—pƒtƒ‰ƒO
-int backprojectMode = HIDDEN_BACKPROJECTION;
-int selectObject = SELECT_OFF;
-int trackObject = TRACKING_STOP;
-int showHist = SHOW_HISTOGRAM;
-
-// CamShiftƒgƒ‰ƒbƒLƒ“ƒO—p•Ï”
-CvPoint origin;
-CvRect selection;
-CvRect trackWindow;
-CvBox2D trackRegion;
-CvConnectedComp trackComp;
-
-// ƒqƒXƒgƒOƒ‰ƒ€—p•Ï”
-int hdims = H_DIMENSION; // ƒqƒXƒgƒOƒ‰ƒ€‚ÌŽŸŒ³”
-float hRangesArray[] = {H_RANGE_MIN, H_RANGE_MAX}; //ƒqƒXƒgƒOƒ‰ƒ€‚̃Œƒ“ƒW
-float *hRanges = hRangesArray;
-int vmin = V_MIN;
-int vmax = V_MAX;
-
-//char *windowNameObjectTracking = "CaptureImage";
-
-//
-// ƒ}ƒEƒXƒhƒ‰ƒbƒO‚É‚æ‚Á‚ĉŠú’Ç՗̈æ‚ðŽw’è‚·‚é
-//
-// ˆø”:
-// event : ƒ}ƒEƒX¶ƒ{ƒ^ƒ“‚Ìó‘Ô
-// x : ƒ}ƒEƒX‚ªŒ»Ýƒ|ƒCƒ“ƒg‚µ‚Ä‚¢‚éxÀ•W
-// y : ƒ}ƒEƒX‚ªŒ»Ýƒ|ƒCƒ“ƒg‚µ‚Ä‚¢‚éyÀ•W
-// flags : –{ƒvƒƒOƒ‰ƒ€‚Å‚Í–¢Žg—p
-// param : –{ƒvƒƒOƒ‰ƒ€‚Å‚Í–¢Žg—p
-//
-static void on_mouse( int event, int x, int y, int flags, void* param ){
- // ‰æ‘œ‚ªŽæ“¾‚³‚ê‚Ä‚¢‚È‚¯‚ê‚ÎAˆ—‚ðs‚í‚È‚¢
- if( resultImage == NULL ){
- return;
- }
-
- // Œ´“_‚̈ʒu‚ɉž‚¶‚Äy‚Ì’l‚𔽓]i‰æ‘œ‚Ì”½“]‚Å‚Í‚È‚¢j
- if( resultImage->origin == 1 ){
- y = resultImage->height - y;
- }
- // ƒ}ƒEƒX‚̶ƒ{ƒ^ƒ“‚ª‰Ÿ‚³‚ê‚Ä‚¢‚ê‚Έȉº‚̈—‚ðs‚¤
- if( selectObject == SELECT_ON ){
- selection.x = MIN( x, origin.x );
- selection.y = MIN( y, origin.y );
- selection.width = selection.x + CV_IABS( x - origin.x );
- selection.height = selection.y + CV_IABS( y - origin.y );
-
- selection.x = MAX( selection.x, 0 );
- selection.y = MAX( selection.y, 0 );
- selection.width = MIN( selection.width, resultImage->width );
- selection.height = MIN( selection.height, resultImage->height );
- selection.width = selection.width - selection.x;
- selection.height = selection.height - selection.y;
- }
- // ƒ}ƒEƒX‚̶ƒ{ƒ^ƒ“‚Ìó‘Ô‚É‚æ‚Á‚Ĉ—‚𕪊ò
- switch( event ){
- case CV_EVENT_LBUTTONDOWN:
- // ƒ}ƒEƒX‚̶ƒ{ƒ^ƒ“‚ª‰Ÿ‚³‚ꂽ‚Ì‚Å‚ ‚ê‚ÎA
- // Œ´“_‚¨‚æ‚Ñ‘I‘ð‚³‚ê‚½—̈æ‚ðÝ’è
- origin = cvPoint( x, y );
- selection = cvRect( x, y, 0, 0 );
- selectObject = SELECT_ON;
- break;
- case CV_EVENT_LBUTTONUP:
- // ƒ}ƒEƒX‚̶ƒ{ƒ^ƒ“‚ª—£‚³‚ꂽ‚Æ‚«Awidth‚Æheight‚ª‚Ç‚¿‚ç‚ೂł ‚ê‚ÎA
- // trackObjectƒtƒ‰ƒO‚ðTRACKING_START‚É‚·‚é
- selectObject = SELECT_OFF;
- if( selection.width > 0 && selection.height > 0 ){
- trackObject = TRACKING_START;
- }
- break;
- }
-}
-
-//
-// “ü—Í‚³‚ꂽ1‚‚ÌF‘Š’l‚ðRGB‚É•ÏŠ·‚·‚é
-//
-// ˆø”:
-// hue : HSV•\FŒn‚É‚¨‚¯‚éF‘Š’lH
-// –ß‚è’lF
-// CvScalar: RGB‚ÌFî•ñ‚ªBGR‚̇‚ÅŠi”[‚³‚ꂽƒRƒ“ƒeƒi
-//
-CvScalar hsv2rgb( float hue ){
- IplImage *rgbValue, *hsvValue;
- rgbValue = cvCreateImage( cvSize(1,1), IPL_DEPTH_8U, 3 );
- hsvValue = cvCreateImage( cvSize(1,1), IPL_DEPTH_8U, 3 );
-
- hsvValue->imageData[0] = hue; // F‘Š’lH
- hsvValue->imageData[1] = 255; // Ê“x’lS
- hsvValue->imageData[2] = 255; // –¾“x’lV
-
- // HSV•\FŒn‚ðRGB•\FŒn‚É•ÏŠ·‚·‚é
- cvCvtColor( hsvValue, rgbValue, CV_HSV2BGR );
-
- return cvScalar( (unsigned char)rgbValue->imageData[0],
- (unsigned char)rgbValue->imageData[1],
- (unsigned char)rgbValue->imageData[2],
- 0 );
-
- // ƒƒ‚ƒŠ‚ð‰ð•ú‚·‚é
- cvReleaseImage( &rgbValue );
- cvReleaseImage( &hsvValue );
-}
-
-
-//
-// ƒ}ƒEƒX‘I‘ð‚³‚ê‚½‰Šú’Ç՗̈æ‚É‚¨‚¯‚éHSV‚ÌH’l‚ŃqƒXƒgƒOƒ‰ƒ€‚ð쬂µAƒqƒXƒgƒOƒ‰ƒ€‚Ì•`‰æ‚Ü‚Å‚ðs‚¤
-//
-// ˆø”:
-// hist : main‚Å錾‚³‚ꂽƒqƒXƒgƒOƒ‰ƒ€—p\‘¢‘Ì
-// hsvImage : “ü—͉摜‚ªHSV•\FŒn‚É•ÏŠ·‚³‚ꂽŒã‚ÌIplImage
-// maskImage : ƒ}ƒXƒN‰æ‘œ—pIplImage
-// selection : ƒ}ƒEƒX‚Å‘I‘ð‚³‚ê‚½‹éŒ`—̈æ
-//
-void CalculateHist( CvHistogram *hist, IplImage *hsvImage, IplImage *maskImage, CvRect selection ){
- int i;
- int binW; // ƒqƒXƒgƒOƒ‰ƒ€‚ÌŠeƒrƒ“‚ÌA‰æ‘œã‚Å‚Ì•
- int val; // ƒqƒXƒgƒOƒ‰ƒ€‚Ì•p“x
- float maxVal; // ƒqƒXƒgƒOƒ‰ƒ€‚ÌÅ‘å•p“x
-
-
- // hsv‰æ‘œ‚ÌŠe‰æ‘f‚ª’l‚͈͓̔à‚É“ü‚Á‚Ä‚¢‚é‚©ƒ`ƒFƒbƒN‚µA
- // ƒ}ƒXƒN‰æ‘œmaskImage‚ð쬂·‚é
- cvInRangeS( hsvImage,
- cvScalar( H_RANGE_MIN, S_MIN, MIN(V_MIN,V_MAX), 0 ),
- cvScalar( H_RANGE_MAX, S_MAX, MAX(V_MIN,V_MAX), 0 ),
- maskImage );
- // hsvImage‚Ì‚¤‚¿A‚Æ‚‚É•K—v‚ÈHƒ`ƒƒƒ“ƒlƒ‹‚ðhueImage‚Æ‚µ‚Ä•ª—£‚·‚é
- cvSplit( hsvImage, hueImage, 0, 0, 0 );
- // trackObject‚ªTRACKING_STARTó‘Ô‚È‚çAˆÈ‰º‚̈—‚ðs‚¤
- if( trackObject == TRACKING_START ){
- // ’Ç՗̈æ‚̃qƒXƒgƒOƒ‰ƒ€ŒvŽZ‚ÆhistImage‚Ö‚Ì•`‰æ
- maxVal = 0.0;
-
- cvSetImageROI( hueImage, selection );
- cvSetImageROI( maskImage, selection );
- // ƒqƒXƒgƒOƒ‰ƒ€‚ðŒvŽZ‚µAÅ‘å’l‚ð‹‚ß‚é
- cvCalcHist( &hueImage, hist, 0, maskImage );
- cvGetMinMaxHistValue( hist, 0, &maxVal, 0, 0 );
- // ƒqƒXƒgƒOƒ‰ƒ€‚ÌcŽ²i•p“xj‚ð0-255‚̃_ƒCƒiƒ~ƒbƒNƒŒƒ“ƒW‚ɳ‹K‰»
- if( maxVal == 0.0 ){
- cvConvertScale( hist->bins, hist->bins, 0.0, 0 );
- } else{
- cvConvertScale( hist->bins, hist->bins, 255.0 / maxVal, 0 );
- }
- // hue,mask‰æ‘œ‚Éݒ肳‚ꂽROI‚ðƒŠƒZƒbƒg
- cvResetImageROI( hueImage );
- cvResetImageROI( maskImage );
-
- trackWindow = selection;
- // trackObject‚ðTRACKING_NOW‚É‚·‚é
- trackObject = TRACKING_NOW;
-
- // ƒqƒXƒgƒOƒ‰ƒ€‰æ‘œ‚ðƒ[ƒƒNƒŠƒA
- cvSetZero( histImage );
- // Šeƒrƒ“‚Ì•‚ðŒˆ‚ß‚é
- binW = histImage->width / hdims;
- // ƒqƒXƒgƒOƒ‰ƒ€‚ð•`‰æ‚·‚é
- for( i = 0; i < hdims; i++ ){
- val = cvRound( cvGetReal1D(hist->bins,i) * histImage->height / 255 );
- CvScalar color = hsv2rgb( i * 180.0 / hdims );
- cvRectangle( histImage,
- cvPoint( i * binW, histImage->height ),
- cvPoint( (i+1) * binW, histImage->height - val ),
- color,
- -1,
- 8,
- 0 );
- }
- }
-}
-
-/*!
- * @brief constructor
- * @param manager Maneger Object
- */
-ObjectTracking::ObjectTracking(RTC::Manager* manager)
- // <rtc-template block="initializer">
- : RTC::DataFlowComponentBase(manager),
- m_orig_imgIn("img_original", m_orig_img),
- m_eventIn("m_event", m_event),
- m_xIn("m_x", m_x),
- m_yIn("m_y", m_y),
- m_out_imgOut("img_output", m_out_img),
- m_hist_imgOut("img_hist", m_hist_img)
-
- // </rtc-template>
-{
-}
-
-/*!
- * @brief destructor
- */
-ObjectTracking::~ObjectTracking()
-{
-}
-
-
-
-RTC::ReturnCode_t ObjectTracking::onInitialize()
-{
- // Registration: InPort/OutPort/Service
- // <rtc-template block="registration">
- // Set InPort buffers
- addInPort("img_original", m_orig_imgIn);
- addInPort("m_event", m_eventIn);
- addInPort("m_x", m_xIn);
- addInPort("m_y", m_yIn);
-
- // Set OutPort buffer
- addOutPort("img_output", m_out_imgOut);
- addOutPort("img_hist", m_hist_imgOut);
-
- // 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_height", m_img_height, "240");
- bindParameter("image_width", m_img_width, "320");
- // </rtc-template>
-
- return RTC::RTC_OK;
-}
-
-/*
-RTC::ReturnCode_t ObjectTracking::onFinalize()
-{
- return RTC::RTC_OK;
-}
-*/
-
-/*
-RTC::ReturnCode_t ObjectTracking::onStartup(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-/*
-RTC::ReturnCode_t ObjectTracking::onShutdown(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-
-RTC::ReturnCode_t ObjectTracking::onActivated(RTC::UniqueId ec_id)
-{
- g_temp_w = 0;
- g_temp_h = 0;
-
- //Šeƒƒ‚ƒŠŠm•Û
- inputImage = NULL;
- resultImage = NULL;
- hsvImage = NULL;
- hueImage = NULL;
- maskImage = NULL;
- backprojectImage = NULL;
- grayImage = NULL;
- histImage = NULL;
-
- return RTC::RTC_OK;
-}
-
-
-RTC::ReturnCode_t ObjectTracking::onDeactivated(RTC::UniqueId ec_id)
-{
- //ƒƒ‚ƒŠ‚©‚ç‰ð•ú
- if(inputImage != NULL){
- cvReleaseImage(&inputImage);
- }
- if(resultImage != NULL){
- cvReleaseImage(&resultImage);
- }
- if(hsvImage != NULL){
- cvReleaseImage(&hsvImage);
- }
- if(hueImage != NULL){
- cvReleaseImage(&hueImage);
- }
- if(hueImage != NULL){
- cvReleaseImage(&maskImage);
- }
- if(backprojectImage != NULL){
- cvReleaseImage(&backprojectImage);
- }
- if(grayImage != NULL){
- cvReleaseImage(&grayImage);
- }
- if(histImage != NULL){
- cvReleaseImage(&histImage);
- }
-
- return RTC::RTC_OK;
-}
-
-
-RTC::ReturnCode_t ObjectTracking::onExecute(RTC::UniqueId ec_id)
-{
- int key; // ƒL[“ü—ÍŒ‹‰Ê‚ðŠi”[‚·‚é•Ï”
- int i;
- int j;
-
- int x;
- int y;
- int mouse_event;
-
- // Snake—p‚̃pƒ‰ƒ[ƒ^
- float alpha = 1.0; // ˜A‘±ƒGƒlƒ‹ƒM[‚Ìd‚݃pƒ‰ƒ[ƒ^
- float beta = 0.5; // ‹È—¦‚Ìd‚݃pƒ‰ƒ[ƒ^
- float gamma = 1.5; // ‰æ‘œƒGƒlƒ‹ƒM[‚Ìd‚݃pƒ‰ƒ[ƒ^
- CvPoint pt[SEGMENT]; // §Œä“_‚ÌÀ•W
- CvSize window; // Ŭ’l‚ð’Tõ‚·‚é‹ß–TƒTƒCƒY
- window.width = WINDOW_WIDTH;
- window.height = WINDOW_HEIGHT;
- CvTermCriteria crit;
- crit.type = CV_TERMCRIT_ITER; // I—¹ðŒ‚ÌÝ’è
- crit.max_iter = ITERATION_SNAKE; // ŠÖ”‚Ìő唽•œ”
-
- if(m_orig_imgIn.isNew()){
-
- m_orig_imgIn.read();
-
- //Šeƒƒ‚ƒŠŠm•Û
- if(inputImage == NULL){
- inputImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 3);
- }
- if(g_temp_w != m_orig_img.width || g_temp_h != m_orig_img.height){
- cvReleaseImage(&inputImage);
- inputImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 3);
- }
- if(resultImage == NULL){
- resultImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 3);
- }
- if(g_temp_w != m_orig_img.width || g_temp_h != m_orig_img.height){
- cvReleaseImage(&resultImage);
- resultImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 3);
- }
- resultImage->origin = inputImage->origin;
- if(hsvImage == NULL){
- hsvImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 3);
- }
- if(g_temp_w != m_orig_img.width || g_temp_h != m_orig_img.height){
- cvReleaseImage(&hsvImage);
- hsvImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 3);
- }
- if(hueImage == NULL){
- hueImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 1);
- }
- if(g_temp_w != m_orig_img.width || g_temp_h != m_orig_img.height){
- cvReleaseImage(&hueImage);
- hueImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 1);
- }
- if(maskImage == NULL){
- maskImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 1);
- }
- if(g_temp_w != m_orig_img.width || g_temp_h != m_orig_img.height){
- cvReleaseImage(&maskImage);
- maskImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 1);
- }
- if(backprojectImage == NULL){
- backprojectImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 1);
- }
- if(g_temp_w != m_orig_img.width || g_temp_h != m_orig_img.height){
- cvReleaseImage(&backprojectImage);
- backprojectImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 1);
- }
- if(grayImage == NULL){
- grayImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 1);
- }
- if(g_temp_w != m_orig_img.width || g_temp_h != m_orig_img.height){
- cvReleaseImage(&grayImage);
- grayImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 1);
- }
- // ƒqƒXƒgƒOƒ‰ƒ€\‘¢‘Ì‚ÌŽg—p‚ð錾
- if(hist == NULL){
- hist = cvCreateHist( 1, &hdims, CV_HIST_ARRAY, &hRanges, 1 );
- }
- // ƒqƒXƒgƒOƒ‰ƒ€—p‚̉摜‚ðŠm•Û‚µAƒ[ƒƒNƒŠƒA
- if(histImage == NULL){
- histImage = cvCreateImage( cvSize(HISTIMAGE_WIDTH, HISTIMAGE_HEIGHT), IPL_DEPTH_8U, 3 );
- }
- if(g_temp_w != m_orig_img.width || g_temp_h != m_orig_img.height){
- cvReleaseImage(&histImage);
- histImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 3);
- }
- cvSetZero( histImage );
-
- //InPort‚̉f‘œ‚̎擾
- memcpy(inputImage->imageData,(void *)&(m_orig_img.pixels[0]),m_orig_img.pixels.length());
-
- // ƒLƒƒƒvƒ`ƒƒ‚³‚ꂽ‰æ‘œ‚ðresultImage‚ɃRƒs[‚µAHSV•\FŒn‚É•ÏŠ·‚µ‚ÄhsvImage‚ÉŠi”[
- cvCopy( inputImage, resultImage, NULL );
- cvCvtColor( resultImage, hsvImage, CV_BGR2HSV );
-
- //Window‚ÌEventî•ñ‚̎擾‚ɑ΂·‚鈗
- if(m_eventIn.isNew() && m_xIn.isNew() && m_yIn.isNew()){
- m_xIn.read();
- m_yIn.read();
- m_eventIn.read();
-
- x = m_x.data;
- y = m_y.data;
- mouse_event = m_event.data;
-
- on_mouse(mouse_event, x, y, 0, 0);
-
- x= 0;
- y= 0;
- mouse_event = 0;
- }
-
- // trackObjectƒtƒ‰ƒO‚ªTRACKING_STOPˆÈŠO‚È‚çAˆÈ‰º‚̈—‚ðs‚¤
- if( trackObject != TRACKING_STOP ){
-
- //’Ç՗̈æ‚̃qƒXƒgƒOƒ‰ƒ€ŒvŽZ‚Æ•`‰æ
- CalculateHist( hist, hsvImage, maskImage, selection );
-
- // ƒoƒbƒNƒvƒƒWƒFƒNƒVƒ‡ƒ“‚ðŒvŽZ‚·‚é
- cvCalcBackProject( &hueImage, backprojectImage, hist );
- // backProjection‚Ì‚¤‚¿Aƒ}ƒXƒN‚ª1‚Å‚ ‚é‚Æ‚³‚ꂽ•”•ª‚Ì‚ÝŽc‚·
- cvAnd( backprojectImage, maskImage, backprojectImage, 0 );
-
- // CamShift–@‚É‚æ‚é—̈æ’ÇÕ‚ðŽÀs‚·‚é
- cvCamShift( backprojectImage,
- trackWindow,
- cvTermCriteria( CV_TERMCRIT_EPS | CV_TERMCRIT_ITER, 10, 1 ),
- &trackComp,
- &trackRegion );
-
- trackWindow = trackComp.rect;
-
- // SnakeImage—p‚̃OƒŒ[ƒXƒP[ƒ‹‰æ‘œ‚ð쬂·‚é
- cvCvtColor( resultImage, grayImage, CV_BGR2GRAY );
-
- if( backprojectMode == SHOW_BACKPROJECTION ){
- cvCvtColor( backprojectImage, resultImage, CV_GRAY2BGR );
- }
- if( resultImage->origin == 1 ){
- trackRegion.angle = -trackRegion.angle;
- }
-
- // CamShift‚ł̗̈æ’ÇÕŒ‹‰Ê‚ðSnake‚̉ŠúˆÊ’u‚ÉÝ’è‚·‚é
- for( i=0; i<SEGMENT; i++ ){
- pt[i].x = cvRound( trackRegion.size.width
- * cos(i * 6.28 / SEGMENT + trackRegion.angle)
- / 2.0 + trackRegion.center.x );
- pt[i].y = cvRound( trackRegion.size.height
- * sin(i * 6.28 / SEGMENT + trackRegion.angle)
- / 2.0 + trackRegion.center.y );
- }
- // Snake‚É‚æ‚é—ÖŠs’Šo‚ðŽÀs‚·‚é
- for( i=0; i<ITERATION_SNAKE; i++ ){
- cvSnakeImage( grayImage,
- pt,
- SEGMENT,
- &alpha,
- &beta,
- &gamma,
- CV_VALUE,
- window,
- crit,
- 1);
- // Še—ÖŠs“_‚ÌŠÔ‚Éü‚ð‚Ђ¢‚Ä—ÖŠsü‚ð•`‰æ‚·‚é
- for( j=0; j<SEGMENT; j++ ){
- if( j < SEGMENT-1 ){
- cvLine( resultImage, pt[j], pt[j+1],
- cvScalar(0,0,255,0), 2, 8, 0 );
- }
- else{
- cvLine( resultImage, pt[j], pt[0],
- cvScalar(0,0,255,0), 2, 8, 0 );
- }
- }
- }
- }
-
- // ƒ}ƒEƒX‚Å‘I‘𒆂̉Šú’Ç՗̈æ‚ÌF‚𔽓]‚³‚¹‚é
- if( selectObject == SELECT_ON && selection.width > 0 && selection.height > 0 ){
-
- cvSetImageROI( resultImage, selection );
- cvXorS( resultImage, cvScalarAll(255), resultImage, 0 );
- cvResetImageROI( resultImage );
- }
- // backprojectImage‚ÌÀ•WŒ´“_‚ª¶ã‚Ìê‡A㉺‚𔽓]‚³‚¹‚é
- if( backprojectImage->origin == 0 ){
- cvFlip( backprojectImage, backprojectImage, 0 );
- }
-
- // ‰æ‘œ‚ð•\Ž¦‚·‚é
- //cvShowImage( windowNameObjectTracking, resultImage );
- //key = cvWaitKey(1);
-
- // ‰æ‘œƒf[ƒ^‚̃TƒCƒYŽæ“¾
- double len = (resultImage->nChannels * resultImage->width * resultImage->height);
- double leng = (histImage->nChannels * histImage->width * histImage->height);
- m_out_img.pixels.length(len);
- m_hist_img.pixels.length(leng);
-
- // ŠY“–‚̃Cƒ[ƒW‚ðMemCopy‚·‚é
- memcpy((void *)&(m_out_img.pixels[0]), resultImage->imageData, len);
- memcpy((void *)&(m_hist_img.pixels[0]), histImage->imageData, leng);
-
- // ”½“]‚µ‚½‰æ‘œƒf[ƒ^‚ðOutPort‚©‚ço—Í‚·‚éB
- m_out_img.width = inputImage->width;
- m_out_img.height = inputImage->height;
-
- m_hist_img.width = inputImage->width;
- m_hist_img.height = inputImage->height;
-
- m_out_imgOut.write();
- m_hist_imgOut.write();
-
- if(inputImage != NULL){
- cvReleaseImage(&inputImage);
- }
- if(resultImage != NULL){
- cvReleaseImage(&resultImage);
- }
- if(hsvImage != NULL){
- cvReleaseImage(&hsvImage);
- }
- if(hueImage != NULL){
- cvReleaseImage(&hueImage);
- }
- if(hueImage != NULL){
- cvReleaseImage(&maskImage);
- }
- if(backprojectImage != NULL){
- cvReleaseImage(&backprojectImage);
- }
- if(grayImage != NULL){
- cvReleaseImage(&grayImage);
- }
- if(histImage != NULL){
- cvReleaseImage(&histImage);
- }
-
- }
-
- return RTC::RTC_OK;
-}
-
-/*
-RTC::ReturnCode_t ObjectTracking::onAborting(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-/*
-RTC::ReturnCode_t ObjectTracking::onError(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-/*
-RTC::ReturnCode_t ObjectTracking::onReset(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-/*
-RTC::ReturnCode_t ObjectTracking::onStateUpdate(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-/*
-RTC::ReturnCode_t ObjectTracking::onRateChanged(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-
-
-extern "C"
-{
-
- void ObjectTrackingInit(RTC::Manager* manager)
- {
- coil::Properties profile(objecttracking_spec);
- manager->registerFactory(profile,
- RTC::Create<ObjectTracking>,
- RTC::Delete<ObjectTracking>);
- }
-
-};
-
-
+// -*- C++ -*-
+/*!
+ * @file ObjectTracking.cpp
+ * @brief Objecttrack component
+ * @date $Date$
+ *
+ * $Id$
+ */
+
+#include "ObjectTracking.h"
+
+// Module specification
+// <rtc-template block="module_spec">
+static const char* objecttracking_spec[] =
+ {
+ "implementation_id", "ObjectTracking",
+ "type_name", "ObjectTracking",
+ "description", "Objecttrack component",
+ "version", "1.1.0",
+ "vendor", "AIST",
+ "category", "Category",
+ "activity_type", "PERIODIC",
+ "kind", "DataFlowComponent",
+ "max_instance", "1",
+ "language", "C++",
+ "lang_type", "compile",
+ ""
+ };
+// </rtc-template>
+
+IplImage *inputImage = NULL; /* 入力ã•ã‚ŒãŸIplImage */
+IplImage *resultImage = NULL; /* 処ç†çµæžœè¡¨ç¤ºç”¨IplImage */
+IplImage *hsvImage = NULL; /* HSV表色系用IplImage */
+IplImage *hueImage = NULL; /* HSV表色系ã®Hãƒãƒ£ãƒ³ãƒãƒ«ç”¨IplImage */
+IplImage *maskImage = NULL; /* マスク画åƒç”¨IplImage */
+IplImage *backprojectImage = NULL; /* ãƒãƒƒã‚¯ãƒ—ãƒã‚¸ã‚§ã‚¯ã‚·ãƒ§ãƒ³ç”»åƒç”¨IplImage */
+IplImage *histImage = NULL; /* ヒストグラムæ画用IplImage */
+IplImage *grayImage = NULL; /* グレースケール画åƒç”¨IplImage */
+
+CvHistogram *hist = NULL; /* ヒストグラム処ç†ç”¨æ§‹é€ 体 */
+
+IplImage *frameImage; /* ã‚ャプãƒãƒ£ç”»åƒç”¨IplImage */
+CvCapture *capture; /* ã‚ー入力çµæžœã‚’æ ¼ç´ã™ã‚‹å¤‰æ•° */
+int count = 0;
+int g_temp_w = 0;
+int g_temp_h = 0;
+
+/* 処ç†ãƒ¢ãƒ¼ãƒ‰é¸æŠžç”¨ãƒ•ãƒ©ã‚° */
+int backprojectMode = HIDDEN_BACKPROJECTION;
+int selectObject = SELECT_OFF;
+int trackObject = TRACKING_STOP;
+int showHist = SHOW_HISTOGRAM;
+
+/* CamShiftトラッã‚ング用変数 */
+CvPoint origin;
+CvRect selection;
+CvRect trackWindow;
+CvBox2D trackRegion;
+CvConnectedComp trackComp;
+
+/* ヒストグラム用変数 */
+int hdims = H_DIMENSION; /* ヒストグラムã®æ¬¡å…ƒæ•° */
+float hRangesArray[] = {H_RANGE_MIN, H_RANGE_MAX}; /* ヒストグラムã®ãƒ¬ãƒ³ã‚¸ */
+float *hRanges = hRangesArray;
+int vmin = V_MIN;
+int vmax = V_MAX;
+
+//
+// マウスドラッグã«ã‚ˆã£ã¦åˆæœŸè¿½è·¡é ˜åŸŸã‚’指定ã™ã‚‹
+//
+// 引数:
+// event : マウス左ボタンã®çŠ¶æ…‹
+// x : マウスãŒç¾åœ¨ãƒã‚¤ãƒ³ãƒˆã—ã¦ã„ã‚‹x座標
+// y : マウスãŒç¾åœ¨ãƒã‚¤ãƒ³ãƒˆã—ã¦ã„ã‚‹y座標
+// flags : 本プãƒã‚°ãƒ©ãƒ ã§ã¯æœªä½¿ç”¨
+// param : 本プãƒã‚°ãƒ©ãƒ ã§ã¯æœªä½¿ç”¨
+//
+static void on_mouse( int event, int x, int y, int flags, void* param ){
+ /* ç”»åƒãŒå–å¾—ã•ã‚Œã¦ã„ãªã‘ã‚Œã°ã€å‡¦ç†ã‚’è¡Œã‚ãªã„ */
+ if( resultImage == NULL ){
+ return;
+ }
+
+ /* 原点ã®ä½ç½®ã«å¿œã˜ã¦yã®å€¤ã‚’å転（画åƒã®å転ã§ã¯ãªã„） */
+ if( resultImage->origin == 1 ){
+ y = resultImage->height - y;
+ }
+ /* マウスã®å·¦ãƒœã‚¿ãƒ³ãŒæŠ¼ã•ã‚Œã¦ã„ã‚Œã°ä»¥ä¸‹ã®å‡¦ç†ã‚’行ㆠ*/
+ if( selectObject == SELECT_ON ){
+ selection.x = MIN( x, origin.x );
+ selection.y = MIN( y, origin.y );
+ selection.width = selection.x + CV_IABS( x - origin.x );
+ selection.height = selection.y + CV_IABS( y - origin.y );
+
+ selection.x = MAX( selection.x, 0 );
+ selection.y = MAX( selection.y, 0 );
+ selection.width = MIN( selection.width, resultImage->width );
+ selection.height = MIN( selection.height, resultImage->height );
+ selection.width = selection.width - selection.x;
+ selection.height = selection.height - selection.y;
+ }
+ /* マウスã®å·¦ãƒœã‚¿ãƒ³ã®çŠ¶æ…‹ã«ã‚ˆã£ã¦å‡¦ç†ã‚’åˆ†å² */
+ switch( event ){
+ case CV_EVENT_LBUTTONDOWN:
+ /* マウスã®å·¦ãƒœã‚¿ãƒ³ãŒæŠ¼ã•ã‚ŒãŸã®ã§ã‚ã‚Œã°ã€åŽŸç‚¹ãŠã‚ˆã³é¸æŠžã•ã‚ŒãŸé ˜åŸŸã‚’è¨å®š */
+ origin = cvPoint( x, y );
+ selection = cvRect( x, y, 0, 0 );
+ selectObject = SELECT_ON;
+ break;
+ case CV_EVENT_LBUTTONUP:
+ /* マウスã®å·¦ãƒœã‚¿ãƒ³ãŒé›¢ã•ã‚ŒãŸã¨ãã€widthã¨heightãŒã©ã¡ã‚‰ã‚‚æ£ã§ã‚ã‚Œã°ã€*/
+ /* trackObjectフラグをTRACKING_STARTã«ã™ã‚‹ */
+ selectObject = SELECT_OFF;
+ if( selection.width > 0 && selection.height > 0 ){
+ trackObject = TRACKING_START;
+ }
+ break;
+ }
+}
+
+//
+// 入力ã•ã‚ŒãŸ1ã¤ã®è‰²ç›¸å€¤ã‚’RGBã«å¤‰æ›ã™ã‚‹
+//
+// 引数:
+// hue : HSV表色系ã«ãŠã‘る色相値H
+// 戻り値：
+// CvScalar: RGBã®è‰²æƒ…å ±ãŒBGRã®é †ã§æ ¼ç´ã•ã‚ŒãŸã‚³ãƒ³ãƒ†ãƒŠ
+//
+CvScalar hsv2rgb( float hue ){
+ IplImage *rgbValue, *hsvValue;
+ rgbValue = cvCreateImage( cvSize(1,1), IPL_DEPTH_8U, 3 );
+ hsvValue = cvCreateImage( cvSize(1,1), IPL_DEPTH_8U, 3 );
+
+ hsvValue->imageData[0] = hue; /* 色相値H */
+ hsvValue->imageData[1] = 255; /* 彩度値S */
+ hsvValue->imageData[2] = 255; /* 明度値V */
+
+ /* HSV表色系をRGB表色系ã«å¤‰æ›ã™ã‚‹ */
+ cvCvtColor( hsvValue, rgbValue, CV_HSV2BGR );
+
+ return cvScalar( (unsigned char)rgbValue->imageData[0],
+ (unsigned char)rgbValue->imageData[1],
+ (unsigned char)rgbValue->imageData[2],
+ 0 );
+
+ /* メモリを解放ã™ã‚‹ */
+ cvReleaseImage( &rgbValue );
+ cvReleaseImage( &hsvValue );
+}
+
+
+//
+// マウスé¸æŠžã•ã‚ŒãŸåˆæœŸè¿½è·¡é ˜åŸŸã«ãŠã‘ã‚‹HSVã®H値ã§ãƒ’ストグラムを作æˆã—ã€ãƒ’ストグラムã®æç”»ã¾ã§ã‚’è¡Œã†
+//
+// 引数:
+// hist : mainã§å®£è¨€ã•ã‚ŒãŸãƒ’ã‚¹ãƒˆã‚°ãƒ©ãƒ ç”¨æ§‹é€ ä½“
+// hsvImage : 入力画åƒãŒHSV表色系ã«å¤‰æ›ã•ã‚ŒãŸå¾Œã®IplImage
+// maskImage : マスク画åƒç”¨IplImage
+// selection : マウスã§é¸æŠžã•ã‚ŒãŸçŸ©å½¢é ˜åŸŸ
+//
+void CalculateHist( CvHistogram *hist, IplImage *hsvImage, IplImage *maskImage, CvRect selection ){
+ int i;
+ int binW; /* ヒストグラムã®å„ビンã®ã€ç”»åƒä¸Šã§ã®å¹… */
+ int val; /* ヒストグラムã®é »åº¦ */
+ float maxVal; /* ヒストグラムã®æœ€å¤§é »åº¦ */
+
+ /* hsvç”»åƒã®å„ç”»ç´ ãŒå€¤ã®ç¯„囲内ã«å…¥ã£ã¦ã„ã‚‹ã‹ãƒã‚§ãƒƒã‚¯ã—〠*/
+ /* マスク画åƒmaskImageを作æˆã™ã‚‹ */
+ cvInRangeS( hsvImage,
+ cvScalar( H_RANGE_MIN, S_MIN, MIN(V_MIN,V_MAX), 0 ),
+ cvScalar( H_RANGE_MAX, S_MAX, MAX(V_MIN,V_MAX), 0 ),
+ maskImage );
+ /* hsvImageã®ã†ã¡ã€ã¨ãã«å¿…è¦ãªHãƒãƒ£ãƒ³ãƒãƒ«ã‚’hueImageã¨ã—ã¦åˆ†é›¢ã™ã‚‹ */
+ cvSplit( hsvImage, hueImage, 0, 0, 0 );
+ /* trackObjectãŒTRACKING_START状態ãªã‚‰ã€ä»¥ä¸‹ã®å‡¦ç†ã‚’行ㆠ*/
+ if( trackObject == TRACKING_START ){
+ /* è¿½è·¡é ˜åŸŸã®ãƒ’ストグラム計算ã¨histImageã¸ã®æç”» */
+ maxVal = 0.0;
+ cvSetImageROI( hueImage, selection );
+ cvSetImageROI( maskImage, selection );
+
+ /* ヒストグラムを計算ã—ã€æœ€å¤§å€¤ã‚’求ã‚ã‚‹ */
+ cvCalcHist( &hueImage, hist, 0, maskImage );
+ cvGetMinMaxHistValue( hist, 0, &maxVal, 0, 0 );
+
+ /* ヒストグラムã®ç¸¦è»¸ï¼ˆé »åº¦ï¼‰ã‚’0-255ã®ãƒ€ã‚¤ãƒŠãƒŸãƒƒã‚¯ãƒ¬ãƒ³ã‚¸ã«æ£è¦åŒ– */
+ if( maxVal == 0.0 ){
+ cvConvertScale( hist->bins, hist->bins, 0.0, 0 );
+ } else{
+ cvConvertScale( hist->bins, hist->bins, 255.0 / maxVal, 0 );
+ }
+
+ /* hue,maskç”»åƒã«è¨å®šã•ã‚ŒãŸROIをリセット */
+ cvResetImageROI( hueImage );
+ cvResetImageROI( maskImage );
+ trackWindow = selection;
+
+ /* trackObjectã‚’TRACKING_NOWã«ã™ã‚‹ */
+ trackObject = TRACKING_NOW;
+
+ /* ヒストグラム画åƒã‚’ゼãƒã‚¯ãƒªã‚¢ */
+ cvSetZero( histImage );
+ /* å„ビンã®å¹…を決ã‚ã‚‹ */
+ binW = histImage->width / hdims;
+ /* ヒストグラムをæç”»ã™ã‚‹ */
+ for( i = 0; i < hdims; i++ ){
+ val = cvRound( cvGetReal1D(hist->bins,i) * histImage->height / 255 );
+ CvScalar color = hsv2rgb( i * 180.0 / hdims );
+ cvRectangle( histImage,
+ cvPoint( i * binW, histImage->height ),
+ cvPoint( (i+1) * binW, histImage->height - val ),
+ color,
+ -1,
+ 8,
+ 0 );
+ }
+ }
+}
+
+/*!
+ * @brief constructor
+ * @param manager Maneger Object
+ */
+ObjectTracking::ObjectTracking(RTC::Manager* manager)
+ // <rtc-template block="initializer">
+ : RTC::DataFlowComponentBase(manager),
+ m_orig_imgIn("img_original", m_orig_img),
+ m_eventIn("m_event", m_event),
+ m_xIn("m_x", m_x),
+ m_yIn("m_y", m_y),
+ m_out_imgOut("img_output", m_out_img),
+ m_hist_imgOut("img_hist", m_hist_img)
+
+ // </rtc-template>
+{
+}
+
+/*!
+ * @brief destructor
+ */
+ObjectTracking::~ObjectTracking()
+{
+}
+
+
+
+RTC::ReturnCode_t ObjectTracking::onInitialize()
+{
+ // Registration: InPort/OutPort/Service
+ // <rtc-template block="registration">
+ // Set InPort buffers
+ addInPort("img_original", m_orig_imgIn);
+ addInPort("m_event", m_eventIn);
+ addInPort("m_x", m_xIn);
+ addInPort("m_y", m_yIn);
+
+ // Set OutPort buffer
+ addOutPort("img_output", m_out_imgOut);
+ addOutPort("img_hist", m_hist_imgOut);
+
+ // Set service provider to Ports
+
+ // Set service consumers to Ports
+
+ // Set CORBA Service Ports
+
+ // </rtc-template>
+
+ // <rtc-template block="bind_config">
+ // </rtc-template>
+
+ return RTC::RTC_OK;
+}
+
+/*
+RTC::ReturnCode_t ObjectTracking::onFinalize()
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t ObjectTracking::onStartup(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t ObjectTracking::onShutdown(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+
+RTC::ReturnCode_t ObjectTracking::onActivated(RTC::UniqueId ec_id)
+{
+ g_temp_w = 0;
+ g_temp_h = 0;
+
+ inputImage = NULL;
+ resultImage = NULL;
+ hsvImage = NULL;
+ hueImage = NULL;
+ maskImage = NULL;
+ backprojectImage = NULL;
+ grayImage = NULL;
+ histImage = NULL;
+
+ return RTC::RTC_OK;
+}
+
+
+RTC::ReturnCode_t ObjectTracking::onDeactivated(RTC::UniqueId ec_id)
+{
+ if(inputImage != NULL){
+ cvReleaseImage(&inputImage);
+ }
+ if(resultImage != NULL){
+ cvReleaseImage(&resultImage);
+ }
+ if(hsvImage != NULL){
+ cvReleaseImage(&hsvImage);
+ }
+ if(hueImage != NULL){
+ cvReleaseImage(&hueImage);
+ }
+ if(hueImage != NULL){
+ cvReleaseImage(&maskImage);
+ }
+ if(backprojectImage != NULL){
+ cvReleaseImage(&backprojectImage);
+ }
+ if(grayImage != NULL){
+ cvReleaseImage(&grayImage);
+ }
+ if(histImage != NULL){
+ cvReleaseImage(&histImage);
+ }
+
+ return RTC::RTC_OK;
+}
+
+
+RTC::ReturnCode_t ObjectTracking::onExecute(RTC::UniqueId ec_id)
+{
+ int i;
+ int j;
+
+ int x;
+ int y;
+ int mouse_event;
+
+ /* Snake用ã®ãƒ‘ラメータ */
+ float alpha = 1.0; /* 連続エãƒãƒ«ã‚®ãƒ¼ã®é‡ã¿ãƒ‘ラメータ */
+ float beta = 0.5; /* 曲率ã®é‡ã¿ãƒ‘ラメータ */
+ float gamma = 1.5; /* ç”»åƒã‚¨ãƒãƒ«ã‚®ãƒ¼ã®é‡ã¿ãƒ‘ラメータ */
+ CvPoint pt[SEGMENT]; /* 制御点ã®åº§æ¨™ */
+ CvSize window; /* 最å°å€¤ã‚’探索ã™ã‚‹è¿‘å‚サイズ */
+ window.width = WINDOW_WIDTH;
+ window.height = WINDOW_HEIGHT;
+ CvTermCriteria crit;
+ crit.type = CV_TERMCRIT_ITER; /* 終了æ¡ä»¶ã®è¨å®š */
+ crit.max_iter = ITERATION_SNAKE; /* 関数ã®æœ€å¤§å復数 */
+
+ if(m_orig_imgIn.isNew()){
+
+ m_orig_imgIn.read();
+
+ /* å„ãƒ¡ãƒ¢ãƒªç¢ºä¿ */
+ if(inputImage == NULL){
+ inputImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 3);
+ }
+ if(g_temp_w != m_orig_img.width || g_temp_h != m_orig_img.height){
+ cvReleaseImage(&inputImage);
+ inputImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 3);
+ }
+ if(resultImage == NULL){
+ resultImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 3);
+ }
+ if(g_temp_w != m_orig_img.width || g_temp_h != m_orig_img.height){
+ cvReleaseImage(&resultImage);
+ resultImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 3);
+ }
+ resultImage->origin = inputImage->origin;
+ if(hsvImage == NULL){
+ hsvImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 3);
+ }
+ if(g_temp_w != m_orig_img.width || g_temp_h != m_orig_img.height){
+ cvReleaseImage(&hsvImage);
+ hsvImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 3);
+ }
+ if(hueImage == NULL){
+ hueImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 1);
+ }
+ if(g_temp_w != m_orig_img.width || g_temp_h != m_orig_img.height){
+ cvReleaseImage(&hueImage);
+ hueImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 1);
+ }
+ if(maskImage == NULL){
+ maskImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 1);
+ }
+ if(g_temp_w != m_orig_img.width || g_temp_h != m_orig_img.height){
+ cvReleaseImage(&maskImage);
+ maskImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 1);
+ }
+ if(backprojectImage == NULL){
+ backprojectImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 1);
+ }
+ if(g_temp_w != m_orig_img.width || g_temp_h != m_orig_img.height){
+ cvReleaseImage(&backprojectImage);
+ backprojectImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 1);
+ }
+ if(grayImage == NULL){
+ grayImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 1);
+ }
+ if(g_temp_w != m_orig_img.width || g_temp_h != m_orig_img.height){
+ cvReleaseImage(&grayImage);
+ grayImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 1);
+ }
+ /* ãƒ’ã‚¹ãƒˆã‚°ãƒ©ãƒ æ§‹é€ ä½“ã®ä½¿ç”¨ã‚’宣言 */
+ if(hist == NULL){
+ hist = cvCreateHist( 1, &hdims, CV_HIST_ARRAY, &hRanges, 1 );
+ }
+ /* ヒストグラム用ã®ç”»åƒã‚’確ä¿ã—ã€ã‚¼ãƒã‚¯ãƒªã‚¢ */
+ if(histImage == NULL){
+ histImage = cvCreateImage( cvSize(HISTIMAGE_WIDTH, HISTIMAGE_HEIGHT), IPL_DEPTH_8U, 3 );
+ }
+ if(g_temp_w != m_orig_img.width || g_temp_h != m_orig_img.height){
+ cvReleaseImage(&histImage);
+ histImage = cvCreateImage(cvSize(m_orig_img.width, m_orig_img.height), IPL_DEPTH_8U, 3);
+ }
+ cvSetZero( histImage );
+
+ /* InPortã®æ˜ åƒã®å–å¾— */
+ memcpy(inputImage->imageData,(void *)&(m_orig_img.pixels[0]),m_orig_img.pixels.length());
+
+ /* ã‚ャプãƒãƒ£ã•ã‚ŒãŸç”»åƒã‚’resultImageã«ã‚³ãƒ”ーã—ã€HSV表色系ã«å¤‰æ›ã—ã¦hsvImageã«æ ¼ç´ */
+ cvCopy( inputImage, resultImage, NULL );
+ cvCvtColor( resultImage, hsvImage, CV_BGR2HSV );
+
+ /* Windowã®Eventæƒ…å ±ã®å–å¾—ã«å¯¾ã™ã‚‹å‡¦ç† */
+ if(m_eventIn.isNew() && m_xIn.isNew() && m_yIn.isNew()){
+ m_xIn.read();
+ m_yIn.read();
+ m_eventIn.read();
+
+ x = m_x.data;
+ y = m_y.data;
+ mouse_event = m_event.data;
+
+ on_mouse(mouse_event, x, y, 0, 0);
+
+ x= 0;
+ y= 0;
+ mouse_event = 0;
+ }
+
+ /* trackObjectフラグãŒTRACKING_STOP以外ãªã‚‰ã€ä»¥ä¸‹ã®å‡¦ç†ã‚’行ㆠ*/
+ if( trackObject != TRACKING_STOP ){
+
+ /* è¿½è·¡é ˜åŸŸã®ãƒ’ストグラム計算ã¨æç”» */
+ CalculateHist( hist, hsvImage, maskImage, selection );
+
+ /* ãƒãƒƒã‚¯ãƒ—ãƒã‚¸ã‚§ã‚¯ã‚·ãƒ§ãƒ³ã‚’計算ã™ã‚‹ */
+ cvCalcBackProject( &hueImage, backprojectImage, hist );
+ /* backProjectionã®ã†ã¡ã€ãƒžã‚¹ã‚¯ãŒ1ã§ã‚ã‚‹ã¨ã•ã‚ŒãŸéƒ¨åˆ†ã®ã¿æ®‹ã™ */
+ cvAnd( backprojectImage, maskImage, backprojectImage, 0 );
+
+ /* CamShift法ã«ã‚ˆã‚‹é ˜åŸŸè¿½è·¡ã‚’実行ã™ã‚‹ */
+ cvCamShift( backprojectImage,
+ trackWindow,
+ cvTermCriteria( CV_TERMCRIT_EPS | CV_TERMCRIT_ITER, 10, 1 ),
+ &trackComp,
+ &trackRegion );
+
+ trackWindow = trackComp.rect;
+
+ /* SnakeImage用ã®ã‚°ãƒ¬ãƒ¼ã‚¹ã‚±ãƒ¼ãƒ«ç”»åƒã‚’作æˆã™ã‚‹ */
+ cvCvtColor( resultImage, grayImage, CV_BGR2GRAY );
+
+ if( backprojectMode == SHOW_BACKPROJECTION ){
+ cvCvtColor( backprojectImage, resultImage, CV_GRAY2BGR );
+ }
+ if( resultImage->origin == 1 ){
+ trackRegion.angle = -trackRegion.angle;
+ }
+
+ /* CamShiftã§ã®é ˜åŸŸè¿½è·¡çµæžœã‚’Snakeã®åˆæœŸä½ç½®ã«è¨å®šã™ã‚‹ */
+ for( i=0; i<SEGMENT; i++ ){
+ pt[i].x = cvRound( trackRegion.size.width
+ * cos(i * 6.28 / SEGMENT + trackRegion.angle)
+ / 2.0 + trackRegion.center.x );
+ pt[i].y = cvRound( trackRegion.size.height
+ * sin(i * 6.28 / SEGMENT + trackRegion.angle)
+ / 2.0 + trackRegion.center.y );
+ }
+ /* Snakeã«ã‚ˆã‚‹è¼ªéƒæŠ½å‡ºã‚’実行ã™ã‚‹ */
+ for( i=0; i<ITERATION_SNAKE; i++ ){
+ cvSnakeImage( grayImage,
+ pt,
+ SEGMENT,
+ &alpha,
+ &beta,
+ &gamma,
+ CV_VALUE,
+ window,
+ crit,
+ 1);
+ /* å„輪éƒç‚¹ã®é–“ã«ç·šã‚’ã²ã„ã¦è¼ªéƒç·šã‚’æç”»ã™ã‚‹ */
+ for( j=0; j<SEGMENT; j++ ){
+ if( j < SEGMENT-1 ){
+ cvLine( resultImage, pt[j], pt[j+1],
+ cvScalar(0,0,255,0), 2, 8, 0 );
+ }
+ else{
+ cvLine( resultImage, pt[j], pt[0],
+ cvScalar(0,0,255,0), 2, 8, 0 );
+ }
+ }
+ }
+ }
+
+ /* マウスã§é¸æŠžä¸ã®åˆæœŸè¿½è·¡é ˜åŸŸã®è‰²ã‚’å転ã•ã›ã‚‹ */
+ if( selectObject == SELECT_ON && selection.width > 0 && selection.height > 0 ){
+
+ cvSetImageROI( resultImage, selection );
+ cvXorS( resultImage, cvScalarAll(255), resultImage, 0 );
+ cvResetImageROI( resultImage );
+ }
+ /* backprojectImageã®åº§æ¨™åŽŸç‚¹ãŒå·¦ä¸Šã®å ´åˆã€ä¸Šä¸‹ã‚’å転ã•ã›ã‚‹ */
+ if( backprojectImage->origin == 0 ){
+ cvFlip( backprojectImage, backprojectImage, 0 );
+ }
+
+ /* ç”»åƒãƒ‡ãƒ¼ã‚¿ã®ã‚µã‚¤ã‚ºå–å¾— */
+ double len = (resultImage->nChannels * resultImage->width * resultImage->height);
+ double leng = (histImage->nChannels * histImage->width * histImage->height);
+ m_out_img.pixels.length(len);
+ m_hist_img.pixels.length(leng);
+
+ /* 該当ã®ã‚¤ãƒ¡ãƒ¼ã‚¸ã‚’MemCopyã™ã‚‹ */
+ memcpy((void *)&(m_out_img.pixels[0]), resultImage->imageData, len);
+ memcpy((void *)&(m_hist_img.pixels[0]), histImage->imageData, leng);
+
+ /* å転ã—ãŸç”»åƒãƒ‡ãƒ¼ã‚¿ã‚’OutPortã‹ã‚‰å‡ºåŠ›ã™ã‚‹ */
+ m_out_img.width = inputImage->width;
+ m_out_img.height = inputImage->height;
+
+ m_hist_img.width = inputImage->width;
+ m_hist_img.height = inputImage->height;
+
+ m_out_imgOut.write();
+ m_hist_imgOut.write();
+
+ if(inputImage != NULL){
+ cvReleaseImage(&inputImage);
+ }
+ if(resultImage != NULL){
+ cvReleaseImage(&resultImage);
+ }
+ if(hsvImage != NULL){
+ cvReleaseImage(&hsvImage);
+ }
+ if(hueImage != NULL){
+ cvReleaseImage(&hueImage);
+ }
+ if(hueImage != NULL){
+ cvReleaseImage(&maskImage);
+ }
+ if(backprojectImage != NULL){
+ cvReleaseImage(&backprojectImage);
+ }
+ if(grayImage != NULL){
+ cvReleaseImage(&grayImage);
+ }
+ if(histImage != NULL){
+ cvReleaseImage(&histImage);
+ }
+ }
+
+ return RTC::RTC_OK;
+}
+
+/*
+RTC::ReturnCode_t ObjectTracking::onAborting(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t ObjectTracking::onError(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t ObjectTracking::onReset(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t ObjectTracking::onStateUpdate(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t ObjectTracking::onRateChanged(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+
+
+extern "C"
+{
+
+ void ObjectTrackingInit(RTC::Manager* manager)
+ {
+ coil::Properties profile(objecttracking_spec);
+ manager->registerFactory(profile,
+ RTC::Create<ObjectTracking>,
+ RTC::Delete<ObjectTracking>);
+ }
+
+};
+
+
More information about the openrtm-commit
mailing list