[openrtm-commit:01347] r119 - in branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration: . cmake cmake/Modules doc doc/content idl include include/ImageCalibration src
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2014年 3月 14日 (金) 17:18:42 JST
Author: kawauchi
Date: 2014-03-14 17:18:42 +0900 (Fri, 14 Mar 2014)
New Revision: 119
Removed:
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/RTC.xml20130611171854
Modified:
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/.project
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/COPYING
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/COPYING.LESSER
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/ImageCalibration.conf
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/README.ImageCalibration
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/RTC.xml
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/License.rtf
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/Modules/FindOpenRTM.cmake
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/cpack_options.cmake.in
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/imagecalibration-config-version.cmake.in
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/imagecalibration-config.cmake.in
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/imagecalibration.pc.in
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/uninstall_target.cmake.in
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/utils.cmake
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/wix.xsl.in
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/doc/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/doc/conf.py.in
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/doc/content/index.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/doc/content/index_j.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/doc/doxyfile.in
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/idl/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/include/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/include/ImageCalibration/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/include/ImageCalibration/ImageCalibration.h
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/rtc.conf
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/src/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/src/ImageCalibration.cpp
branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/src/ImageCalibrationComp.cpp
Log:
ImageCalibration : Changed the configuration by adding a service port. refs #2704
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/.project
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/.project 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/.project 2014-03-14 08:18:42 UTC (rev 119)
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>ImageCalibration</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>ImageCalibration</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/CMakeLists.txt 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/CMakeLists.txt 2014-03-14 08:18:42 UTC (rev 119)
@@ -1,110 +1,122 @@
-cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-cmake_policy(SET CMP0002 OLD)
-
-project(ImageCalibration)
-string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
-include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.0.0 CACHE STRING "ImageCalibration version")
-DISSECT_VERSION()
-set(PROJECT_DESCRIPTION "ImageCalibration 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_CUSTOM_TARGET (${PROJECT_NAME}_uninstall "${CMAKE_COMMAND}" -P
- "${PROJECT_BINARY_DIR}/uninstall_target.cmake")
-
-#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)
-
-
+cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
+cmake_policy(SET CMP0002 OLD)
+
+project(ImageCalibration)
+string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
+include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
+set(PROJECT_VERSION 1.1.0 CACHE STRING "ImageCalibration version")
+DISSECT_VERSION()
+set(PROJECT_DESCRIPTION "Image Calibration")
+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")
+
+# 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")
+
+#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)
+
+#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/ImageCalibration/COPYING
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/COPYING 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/COPYING 2014-03-14 08:18:42 UTC (rev 119)
@@ -1,674 +1,674 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- <program> Copyright (C) <year> <name of author>
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/COPYING.LESSER
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/COPYING.LESSER 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/COPYING.LESSER 2014-03-14 08:18:42 UTC (rev 119)
@@ -1,165 +1,165 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
- This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
- 0. Additional Definitions.
-
- As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
- "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
- An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
- A "Combined Work" is a work produced by combining or linking an
-Application with the Library. The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
- The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
- The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
- 1. Exception to Section 3 of the GNU GPL.
-
- You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
- 2. Conveying Modified Versions.
-
- If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
- a) under this License, provided that you make a good faith effort to
- ensure that, in the event an Application does not supply the
- function or data, the facility still operates, and performs
- whatever part of its purpose remains meaningful, or
-
- b) under the GNU GPL, with none of the additional permissions of
- this License applicable to that copy.
-
- 3. Object Code Incorporating Material from Library Header Files.
-
- The object code form of an Application may incorporate material from
-a header file that is part of the Library. You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
- a) Give prominent notice with each copy of the object code that the
- Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the object code with a copy of the GNU GPL and this license
- document.
-
- 4. Combined Works.
-
- You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
- a) Give prominent notice with each copy of the Combined Work that
- the Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the Combined Work with a copy of the GNU GPL and this license
- document.
-
- c) For a Combined Work that displays copyright notices during
- execution, include the copyright notice for the Library among
- these notices, as well as a reference directing the user to the
- copies of the GNU GPL and this license document.
-
- d) Do one of the following:
-
- 0) Convey the Minimal Corresponding Source under the terms of this
- License, and the Corresponding Application Code in a form
- suitable for, and under terms that permit, the user to
- recombine or relink the Application with a modified version of
- the Linked Version to produce a modified Combined Work, in the
- manner specified by section 6 of the GNU GPL for conveying
- Corresponding Source.
-
- 1) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (a) uses at run time
- a copy of the Library already present on the user's computer
- system, and (b) will operate properly with a modified version
- of the Library that is interface-compatible with the Linked
- Version.
-
- e) Provide Installation Information, but only if you would otherwise
- be required to provide such information under section 6 of the
- GNU GPL, and only to the extent that such information is
- necessary to install and execute a modified version of the
- Combined Work produced by recombining or relinking the
- Application with a modified version of the Linked Version. (If
- you use option 4d0, the Installation Information must accompany
- the Minimal Corresponding Source and Corresponding Application
- Code. If you use option 4d1, you must provide the Installation
- Information in the manner specified by section 6 of the GNU GPL
- for conveying Corresponding Source.)
-
- 5. Combined Libraries.
-
- You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
- a) Accompany the combined library with a copy of the same work based
- on the Library, uncombined with any other library facilities,
- conveyed under the terms of this License.
-
- b) Give prominent notice with the combined library that part of it
- is a work based on the Library, and explaining where to find the
- accompanying uncombined form of the same work.
-
- 6. Revised Versions of the GNU Lesser General Public License.
-
- The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
- If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+ This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+ 0. Additional Definitions.
+
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+ "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+ An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+ A "Combined Work" is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+ The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+ The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+ 1. Exception to Section 3 of the GNU GPL.
+
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+ 2. Conveying Modified Versions.
+
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+ a) under this License, provided that you make a good faith effort to
+ ensure that, in the event an Application does not supply the
+ function or data, the facility still operates, and performs
+ whatever part of its purpose remains meaningful, or
+
+ b) under the GNU GPL, with none of the additional permissions of
+ this License applicable to that copy.
+
+ 3. Object Code Incorporating Material from Library Header Files.
+
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the
+ Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the object code with a copy of the GNU GPL and this license
+ document.
+
+ 4. Combined Works.
+
+ You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+ a) Give prominent notice with each copy of the Combined Work that
+ the Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
+ document.
+
+ c) For a Combined Work that displays copyright notices during
+ execution, include the copyright notice for the Library among
+ these notices, as well as a reference directing the user to the
+ copies of the GNU GPL and this license document.
+
+ d) Do one of the following:
+
+ 0) Convey the Minimal Corresponding Source under the terms of this
+ License, and the Corresponding Application Code in a form
+ suitable for, and under terms that permit, the user to
+ recombine or relink the Application with a modified version of
+ the Linked Version to produce a modified Combined Work, in the
+ manner specified by section 6 of the GNU GPL for conveying
+ Corresponding Source.
+
+ 1) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (a) uses at run time
+ a copy of the Library already present on the user's computer
+ system, and (b) will operate properly with a modified version
+ of the Library that is interface-compatible with the Linked
+ Version.
+
+ e) Provide Installation Information, but only if you would otherwise
+ be required to provide such information under section 6 of the
+ GNU GPL, and only to the extent that such information is
+ necessary to install and execute a modified version of the
+ Combined Work produced by recombining or relinking the
+ Application with a modified version of the Linked Version. (If
+ you use option 4d0, the Installation Information must accompany
+ the Minimal Corresponding Source and Corresponding Application
+ Code. If you use option 4d1, you must provide the Installation
+ Information in the manner specified by section 6 of the GNU GPL
+ for conveying Corresponding Source.)
+
+ 5. Combined Libraries.
+
+ You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+ a) Accompany the combined library with a copy of the same work based
+ on the Library, uncombined with any other library facilities,
+ conveyed under the terms of this License.
+
+ b) Give prominent notice with the combined library that part of it
+ is a work based on the Library, and explaining where to find the
+ accompanying uncombined form of the same work.
+
+ 6. Revised Versions of the GNU Lesser General Public License.
+
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+ If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/ImageCalibration.conf
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/ImageCalibration.conf 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/ImageCalibration.conf 2014-03-14 08:18:42 UTC (rev 119)
@@ -1,134 +1,134 @@
-# -*- sh -*-
-#------------------------------------------------------------
-# Configuration file for ImageCalibration
-#
-# This configuration file name should be specified in rtc.conf (or other
-# configuration file specified by -f option) by "config_file" property.
-#
-# Category.ImageCalibration.config_file: ImageCalibration.conf
-# or
-# Category.ImageCalibration0.config_file: ImageCalibration0.conf
-# Category.ImageCalibration1.config_file: ImageCalibration1.conf
-# Category.ImageCalibration2.config_file: ImageCalibration2.conf
-#
-# ------------------------------------------------------------
-# An example configuration file for ImageCalibration
-#
-# 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__.board_w, text
-# conf.__widget__.board_h, text
-# conf.__widget__.camera_Height, 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 ImageCalibration
+#
+# This configuration file name should be specified in rtc.conf (or other
+# configuration file specified by -f option) by "config_file" property.
+#
+# Category.ImageCalibration.config_file: ImageCalibration.conf
+# or
+# Category.ImageCalibration0.config_file: ImageCalibration0.conf
+# Category.ImageCalibration1.config_file: ImageCalibration1.conf
+# Category.ImageCalibration2.config_file: ImageCalibration2.conf
+#
+# ------------------------------------------------------------
+# An example configuration file for ImageCalibration
+#
+# 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__.checker_w, text
+# conf.__widget__.checker_h, text
+# conf.__widget__.image_num, 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
+
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/README.ImageCalibration
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/README.ImageCalibration 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/README.ImageCalibration 2014-03-14 08:18:42 UTC (rev 119)
@@ -1,250 +1,174 @@
-======================================================================
- RTComponent: ImageCalibration specificatioin
-
- OpenRTM-aist-1.0.0
- Date: $Date$
-
- This file is generated by rtc-template with the following argments.
-
-# rtc-template -bcxx --module-name=ImageCalibration
-# --module-desc='ImageCalibration 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=board_w:int:11 --config=board_h:int:8 --config=camera_Height:float:-20
-# --inport=inputImage:RTC::CameraImage --inport=key:RTC::TimedLong --outport=orignalImage:RTC::CameraImage --outport=birdImage:RTC::CameraImage --outport=internalParameter:RTC::TimedString --outport=externalParameter:RTC::TimedString --outport=renseParameter:RTC::TimedString
-
-
-======================================================================
- Basic Information
-======================================================================
-# <rtc-template block="module">
-Module Name: ImageCalibration
-Description: ImageCalibration 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: inputImage
- PortNumber: 0
- Description:
- PortType:
- DataType: RTC::CameraImage
- MaxOut:
- [Data Elements]
- Name:
- Type:
- Number:
- Semantics:
- Unit:
- Frequency:
- Operation Cycle:
- RangeLow:
- RangeHigh:
- DefaultValue:
-
- Name: key
- PortNumber: 1
- 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: orignalImage
- PortNumber: 0
- Description:
- PortType:
- DataType: RTC::CameraImage
- MaxOut:
- [Data Elements]
- Name:
- Type:
- Number:
- Semantics:
- Unit:
- Frequency:
- Operation Cycle:
- RangeLow:
- RangeHigh:
- DefaultValue:
-
- Name: birdImage
- PortNumber: 1
- Description:
- PortType:
- DataType: RTC::CameraImage
- MaxOut:
- [Data Elements]
- Name:
- Type:
- Number:
- Semantics:
- Unit:
- Frequency:
- Operation Cycle:
- RangeLow:
- RangeHigh:
- DefaultValue:
-
- Name: internalParameter
- PortNumber: 2
- Description:
- PortType:
- DataType: RTC::TimedString
- MaxOut:
- [Data Elements]
- Name:
- Type:
- Number:
- Semantics:
- Unit:
- Frequency:
- Operation Cycle:
- RangeLow:
- RangeHigh:
- DefaultValue:
-
- Name: externalParameter
- PortNumber: 3
- Description:
- PortType:
- DataType: RTC::TimedString
- MaxOut:
- [Data Elements]
- Name:
- Type:
- Number:
- Semantics:
- Unit:
- Frequency:
- Operation Cycle:
- RangeLow:
- RangeHigh:
- DefaultValue:
-
- Name: renseParameter
- PortNumber: 4
- Description:
- PortType:
- DataType: RTC::TimedString
- 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: board_w
- Description:
- Type: int
- DefaultValue: 11
- Unit:
- Range:
- Constraint:
-
- Name: board_h
- Description:
- Type: int
- DefaultValue: 8
- Unit:
- Range:
- Constraint:
-
- Name: camera_Height
- Description:
- Type: float
- DefaultValue: -20
- 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: ImageCalibration specificatioin
+
+ OpenRTM-aist-1.0.0
+ Date: $Date$
+
+ This file is generated by rtc-template with the following argments.
+
+# rtc-template -bcxx --module-name=ImageCalibration
+# --module-desc='Image Calibration' --module-version=1.1.0 --module-vendor=AIST
+# --module-category=Category --module-comp-type=STATIC
+# --module-act-type=PERIODIC --module-max-inst=1
+# --config=checker_w:int:13 --config=checker_h:int:9 --config=image_num:int:5
+# --inport=original_image:RTC::CameraImage --outport=checker_image:RTC::CameraImage
+# --service-idl=/home/openrtm/opt/ImageProcessing/opencv/components/ImageCalibration/CalibrationService.idl
+# --service=CameraCalibrationService:CalibrationService:ImageCalibService::CalibrationService
+
+
+======================================================================
+ Basic Information
+======================================================================
+# <rtc-template block="module">
+Module Name: ImageCalibration
+Description: Image Calibration
+Version: 1.1.0
+Vendor: AIST
+Category: Category
+Kind: DataFlowComponent
+Comp. Type: STATIC
+Act. Type: PERIODIC
+MAX Inst.: 1
+Lang: C++
+Lang Type:
+
+# </rtc-template>
+
+
+======================================================================
+ Activity definition
+======================================================================
+
+[on_initialize] implemented
+
+[on_finalize]
+
+[on_startup]
+
+[on_shutdown]
+
+[on_activated] implemented
+
+[on_deactivated] implemented
+
+[on_execute] implemented
+
+[on_aborting]
+
+[on_error]
+
+[on_reset]
+
+[on_state_update]
+
+[on_rate_changed]
+
+======================================================================
+ InPorts definition
+======================================================================
+# <rtc-template block="inport">
+
+ Name: original_image
+ PortNumber: 0
+ Description:
+ PortType:
+ DataType: RTC::CameraImage
+ MaxOut:
+ [Data Elements]
+ Name:
+ Type:
+ Number:
+ Semantics:
+ Unit:
+ Frequency:
+ Operation Cycle:
+ RangeLow:
+ RangeHigh:
+ DefaultValue:
+
+
+# </rtc-template>
+
+======================================================================
+ OutPorts definition
+======================================================================
+# <rtc-template block="outport">
+
+ Name: checker_image
+ PortNumber: 0
+ 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">
+ PortName: CameraCalibrationService
+ Description:
+ Interface:
+ [Service Provider Interfaces]
+ Name: CalibrationService
+ Type: ImageCalibService::CalibrationService
+ Description:
+ Argument:
+ Return Value:
+ Exception:
+ PreCondition:
+ PostCondition:
+# </rtc-template>
+
+======================================================================
+ Configuration definition
+======================================================================
+# <rtc-template block="configuration">
+ Configuration:
+ Name: checker_w
+ Description:
+ Type: int
+ DefaultValue: 13
+ Unit:
+ Range:
+ Constraint:
+
+ Name: checker_h
+ Description:
+ Type: int
+ DefaultValue: 9
+ Unit:
+ Range:
+ Constraint:
+
+ Name: image_num
+ Description:
+ Type: int
+ DefaultValue: 5
+ Unit:
+ Range:
+ Constraint:
+
+# </rtc-template>
+
+This software is developed at the National Institute of Advanced
+Industrial Science and Technology. Approval number H23PRO-????. This
+software is licensed under the Lesser General Public License. See
+COPYING.LESSER.
+
+This area is reserved for future OpenRTM.
+
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/RTC.xml
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/RTC.xml 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/RTC.xml 2014-03-14 08:18:42 UTC (rev 119)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:ImageCalibration: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="ImageCalibration" rtc:updateDate="2013-06-11T16:51:16+09:00" rtc:creationDate="2013-06-11T16:51:16+09:00" rtc:version="1.0.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="ImageCalibration component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="ImageCalibration"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:ImageCalibration:1.1.0" xmlns:rtcExt="http://www.openrtp.org/namespaces/rtc_ext" xmlns:rtc="http://www.openrtp.org/namespaces/rtc" xmlns:rtcDoc="http://www.openrtp.org/namespaces/rtc_doc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <rtc:BasicInfo xsi:type="rtcExt:basic_info_ext" rtcExt:saveProject="ImageCalibration" rtc:updateDate="2013-12-24T13:43:06+09:00" rtc:creationDate="2013-12-24T13:31:34+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Image Calibration" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="ImageCalibration"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
@@ -18,22 +18,20 @@
<rtc:OnModeChanged xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
</rtc:Actions>
<rtc:ConfigurationSet>
- <rtc:Configuration xsi:type="rtcExt:configuration_ext" rtcExt:variableName="m_board_w" rtc:unit="" rtc:defaultValue="11" rtc:type="int" rtc:name="board_w">
+ <rtc:Configuration xsi:type="rtcExt:configuration_ext" rtcExt:variableName="checker_w" rtc:unit="" rtc:defaultValue="13" rtc:type="int" rtc:name="checker_w">
<rtcExt:Properties rtcExt:value="text" rtcExt:name="__widget__"/>
</rtc:Configuration>
- <rtc:Configuration xsi:type="rtcExt:configuration_ext" rtcExt:variableName="board_h" rtc:unit="" rtc:defaultValue="8" rtc:type="int" rtc:name="board_h">
+ <rtc:Configuration xsi:type="rtcExt:configuration_ext" rtcExt:variableName="checker_h" rtc:unit="" rtc:defaultValue="9" rtc:type="int" rtc:name="checker_h">
<rtcExt:Properties rtcExt:value="text" rtcExt:name="__widget__"/>
</rtc:Configuration>
- <rtc:Configuration xsi:type="rtcExt:configuration_ext" rtcExt:variableName="camera_Height" rtc:unit="" rtc:defaultValue="-20" rtc:type="float" rtc:name="camera_Height">
+ <rtc:Configuration xsi:type="rtcExt:configuration_ext" rtcExt:variableName="image_num" rtc:unit="" rtc:defaultValue="5" rtc:type="int" rtc:name="image_num">
<rtcExt:Properties rtcExt:value="text" rtcExt:name="__widget__"/>
</rtc:Configuration>
</rtc:ConfigurationSet>
- <rtc:DataPorts xsi:type="rtcExt:dataport_ext" rtcExt:position="LEFT" rtcExt:variableName="inputImage" rtc:unit="" rtc:subscriptionType="" rtc:dataflowType="" rtc:interfaceType="" rtc:idlFile="" rtc:type="RTC::CameraImage" rtc:name="inputImage" rtc:portType="DataInPort"/>
- <rtc:DataPorts xsi:type="rtcExt:dataport_ext" rtcExt:position="LEFT" rtcExt:variableName="key" rtc:unit="" rtc:subscriptionType="" rtc:dataflowType="" rtc:interfaceType="" rtc:idlFile="" rtc:type="RTC::TimedLong" rtc:name="key" rtc:portType="DataInPort"/>
- <rtc:DataPorts xsi:type="rtcExt:dataport_ext" rtcExt:position="RIGHT" rtcExt:variableName="origImage" rtc:unit="" rtc:subscriptionType="" rtc:dataflowType="" rtc:interfaceType="" rtc:idlFile="" rtc:type="RTC::CameraImage" rtc:name="orignalImage" rtc:portType="DataOutPort"/>
- <rtc:DataPorts xsi:type="rtcExt:dataport_ext" rtcExt:position="RIGHT" rtcExt:variableName="birdImage" rtc:unit="" rtc:subscriptionType="" rtc:dataflowType="" rtc:interfaceType="" rtc:idlFile="" rtc:type="RTC::CameraImage" rtc:name="birdImage" rtc:portType="DataOutPort"/>
- <rtc:DataPorts xsi:type="rtcExt:dataport_ext" rtcExt:position="RIGHT" rtcExt:variableName="internalParameter" rtc:unit="" rtc:subscriptionType="" rtc:dataflowType="" rtc:interfaceType="" rtc:idlFile="" rtc:type="RTC::TimedString" rtc:name="internalParameter" rtc:portType="DataOutPort"/>
- <rtc:DataPorts xsi:type="rtcExt:dataport_ext" rtcExt:position="RIGHT" rtcExt:variableName="externalParameter" rtc:unit="" rtc:subscriptionType="" rtc:dataflowType="" rtc:interfaceType="" rtc:idlFile="" rtc:type="RTC::TimedString" rtc:name="externalParameter" rtc:portType="DataOutPort"/>
- <rtc:DataPorts xsi:type="rtcExt:dataport_ext" rtcExt:position="RIGHT" rtcExt:variableName="renseParameter" rtc:unit="" rtc:subscriptionType="" rtc:dataflowType="" rtc:interfaceType="" rtc:idlFile="" rtc:type="RTC::TimedString" rtc:name="renseParameter" rtc:portType="DataOutPort"/>
+ <rtc:DataPorts xsi:type="rtcExt:dataport_ext" rtcExt:position="LEFT" rtcExt:variableName="img_orig" rtc:unit="" rtc:subscriptionType="" rtc:dataflowType="" rtc:interfaceType="" rtc:idlFile="" rtc:type="RTC::CameraImage" rtc:name="original_image" rtc:portType="DataInPort"/>
+ <rtc:DataPorts xsi:type="rtcExt:dataport_ext" rtcExt:position="RIGHT" rtcExt:variableName="img_check" rtc:unit="" rtc:subscriptionType="" rtc:dataflowType="" rtc:interfaceType="" rtc:idlFile="" rtc:type="RTC::CameraImage" rtc:name="checker_image" rtc:portType="DataOutPort"/>
+ <rtc:ServicePorts xsi:type="rtcExt:serviceport_ext" rtcExt:position="RIGHT" rtc:name="CameraCalibrationService">
+ <rtc:ServiceInterface xsi:type="rtcExt:serviceinterface_ext" rtcExt:variableName="" rtc:path="/usr/include/openrtm-1.1/rtm/idl" rtc:type="ImageCalibService::CalibrationService" rtc:idlFile="/home/openrtm/opt/ImageProcessing/opencv/components/ImageCalibration/CalibrationService.idl" rtc:instanceName="" rtc:direction="Provided" rtc:name="CalibrationService"/>
+ </rtc:ServicePorts>
<rtc:Language xsi:type="rtcExt:language_ext" rtc:kind="C++"/>
</rtc:RtcProfile>
Deleted: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/RTC.xml20130611171854
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/RTC.xml20130611171854 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/RTC.xml20130611171854 2014-03-14 08:18:42 UTC (rev 119)
@@ -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-11T16:51:16+09:00" rtc:creationDate="2013-06-11T16:51: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/ImageCalibration/cmake/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/CMakeLists.txt 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/CMakeLists.txt 2014-03-14 08:18:42 UTC (rev 119)
@@ -1,18 +1,18 @@
-set(PKG_DEPS "openrtm-aist")
-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 CMake modules
-set(cmake_config ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config.cmake)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME_LOWER}-config.cmake.in
- ${cmake_config} @ONLY)
-set(cmake_version_config
- ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config-version.cmake)
-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)
-
+set(PKG_DEPS "openrtm-aist")
+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 CMake modules
+set(cmake_config ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config.cmake)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME_LOWER}-config.cmake.in
+ ${cmake_config} @ONLY)
+set(cmake_version_config
+ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config-version.cmake)
+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)
+
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/License.rtf
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/License.rtf 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/License.rtf 2014-03-14 08:18:42 UTC (rev 119)
@@ -1,7 +1,7 @@
-{\rtf1\ansi\ansicpg932\deff0\deflang1033\deflangfe1041{\fonttbl{\f0\froman\fprq1\fcharset128 \'82\'6c\'82\'72 \'82\'6f\'83\'53\'83\'56\'83\'62\'83\'4e;}}
-{\*\generator Msftedit 5.41.15.1515;}\viewkind4\uc1\pard\lang1041\f0\fs20 LICENSE\par
-=======\par
-\par
-This is an installer created using CPack (http://www.cmake.org). No license provided.\par
-\par
-}
+{\rtf1\ansi\ansicpg932\deff0\deflang1033\deflangfe1041{\fonttbl{\f0\froman\fprq1\fcharset128 \'82\'6c\'82\'72 \'82\'6f\'83\'53\'83\'56\'83\'62\'83\'4e;}}
+{\*\generator Msftedit 5.41.15.1515;}\viewkind4\uc1\pard\lang1041\f0\fs20 LICENSE\par
+=======\par
+\par
+This is an installer created using CPack (http://www.cmake.org). No license provided.\par
+\par
+}
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/Modules/FindOpenRTM.cmake
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/Modules/FindOpenRTM.cmake 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/Modules/FindOpenRTM.cmake 2014-03-14 08:18:42 UTC (rev 119)
@@ -1,134 +1,134 @@
-# Find OpenRTM-aist
-#
-# The following additional directories are searched:
-# OPENRTM_ROOT (CMake variable)
-# OPENRTM_ROOT (Environment variable)
-#
-# This sets the following variables:
-# OPENRTM_FOUND - True if OpenRTM-aist was found.
-# OPENRTM_INCLUDE_DIRS - Directories containing the OpenRTM-aist include files.
-# OPENRTM_LIBRARIES - Libraries needed to use OpenRTM-aist.
-# OPENRTM_CFLAGS - Compiler flags for OpenRTM-aist.
-# OPENRTM_VERSION - The version of OpenRTM-aist found.
-# OPENRTM_VERSION_MAJOR - The major version of OpenRTM-aist found.
-# OPENRTM_VERSION_MINOR - The minor version of OpenRTM-aist found.
-# OPENRTM_VERSION_REVISION - The revision version of OpenRTM-aist found.
-# OPENRTM_VERSION_CANDIDATE - The candidate version of OpenRTM-aist found.
-# OPENRTM_IDL_COMPILER - The IDL compiler used by OpenRTM-aist.
-# OPENRTM_IDL_FLAGS - The flags used to compile OpenRTM-aist IDL files.
-# OPENRTM_IDL_DIR - The directory containing the OpenRTM-aist IDL files.
-#
-# This module also defines one macro usable in your CMakeLists.txt files:
-# OPENRTM_COMPILE_IDL_FILES(file1 file2 ...)
-# Compiles the specified IDL files, placing the generated C++ source files in
-# ${CMAKE_CURRENT_BINARY_DIR}. The source files can be found in file1_SRCS,
-# file2_SRCS, etc., and all source files for all IDL files are available in
-# ALL_IDL_SRCS. To depend on the generated files, depend on the targets
-# file1_TGT, file2_TGT, etc. The target ALL_IDL_TGT is available to depend on
-# all source files generated from IDL files.
-
-find_package(PkgConfig)
-pkg_check_modules(PC_OPENRTM openrtm-aist)
-pkg_check_modules(PC_COIL libcoil)
-pkg_check_modules(PC_OMNIORB4 omniORB4)
-pkg_check_modules(PC_OMNITHREAD3 omnithread3)
-pkg_check_modules(PC_OMNIDYNAMIC4 omniDynamic4)
-if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
- pkg_check_modules(PC_UUID uuid)
-endif ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
-
-find_path(OPENRTM_INCLUDE_DIR rtm/RTC.h
- HINTS ${OPENRTM_ROOT}/include ${OPENRTM_ROOT} $ENV{OPENRTM_ROOT}/include ${PC_OPENRTM_INCLUDE_DIRS})
-
-find_path(COIL_INCLUDE_DIR coil/config_coil.h
- HINTS ${OPENRTM_ROOT}/include $ENV{OPENRTM_ROOT}/include ${PC_COIL_INCLUDE_DIRS})
-
-find_path(OMNIORB4_INCLUDE_DIR omniORB4/omniORB.h
- HITS ${OMNI_ROOT}/include ${PC_OMNIORB4_INCLUDE_DIRS})
-
-find_library(OPENRTM_LIBRARY RTC
- HINTS ${OPENRTM_ROOT}/lib $ENV{OPENRTM_ROOT}/lib
- ${PC_OPENRTM_LIBRARY_DIRS})
-find_library(COIL_LIBRARY coil
- HINTS ${OPENRTM_ROOT}/lib $ENV{OPENRTM_ROOT}/lib
- ${PC_COIL_LIBRARY_DIRS})
-find_library(OMNIORB4_LIBRARY omniORB4
- HINTS ${PC_OMNIORB4_LIBRARY_DIRS})
-find_library(OMNITHREAD3_LIBRARY omnithread
- HINTS ${PC_OMNITHREAD3_LIBRARY_DIRS})
-find_library(OMNIDYNAMIC4_LIBRARY omniDynamic4
- HINTS ${PC_OMNIDYNAMIC4_LIBRARY_DIRS})
-if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
- find_library(UUID_LIBRARY uuid
- HINTS ${PC_UUID_LIBRARY_DIRS})
-else ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
- set(UUID_LIBRARY "")
-endif ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
-
-set(OPENRTM_CFLAGS ${PC_OPENRTM_CFLAGS_OTHER} ${PC_COIL_CFLAGS_OTHER} ${PC_OMNIORB4_CFLAGS_OTHER})
-set(OPENRTM_INCLUDE_DIRS ${OPENRTM_INCLUDE_DIR} ${OPENRTM_INCLUDE_DIR}/rtm/idl
- ${COIL_INCLUDE_DIR} ${OMNIORB4_INCLUDE_DIR})
-set(OPENRTM_LIBRARIES ${OPENRTM_LIBRARY} ${COIL_LIBRARY} ${OMNIORB4_LIBRARY} ${OMNITHREAD3_LIBRARY} ${OMNIDYNAMIC4_LIBRARY} ${UUID_LIBRARY} dl pthread)
-
-file(STRINGS ${OPENRTM_INCLUDE_DIR}/rtm/version.h OPENRTM_VERSION
- NEWLINE_CONSUME)
-#set(OPENRTM_VERSION "1.1.0")
-string(REGEX MATCH "version = \"([0-9]+)\\.([0-9]+)\\.([0-9]+)-?([a-zA-Z0-9]*)\""
- OPENRTM_VERSION "${OPENRTM_VERSION}")
-set(OPENRTM_VERSION_MAJOR ${CMAKE_MATCH_1})
-set(OPENRTM_VERSION_MINOR ${CMAKE_MATCH_2})
-set(OPENRTM_VERSION_REVISION ${CMAKE_MATCH_3})
-set(OPENRTM_VERSION_CANDIDATE ${CMAKE_MATCH_4})
-
-execute_process(COMMAND rtm-config --libs-only-l OUTPUT_VARIABLE
- OPENRTM_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND rtm-config --libs-only-L OUTPUT_VARIABLE
- OPENRTM_LIBRARY_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND rtm-config --idlc OUTPUT_VARIABLE OPENRTM_IDL_COMPILER
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND rtm-config --idlflags OUTPUT_VARIABLE OPENRTM_IDL_FLAGS
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-separate_arguments(OPENRTM_IDL_FLAGS)
-execute_process(COMMAND rtm-config --prefix OUTPUT_VARIABLE _rtm_prefix
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-set(OPENRTM_IDL_DIR
- ${_rtm_prefix}/include/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}/rtm/idl
- CACHE STRING "Directory containing the OpenRTM-aist IDL files.")
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(OpenRTM
- REQUIRED_VARS OPENRTM_INCLUDE_DIR COIL_INCLUDE_DIR OPENRTM_LIBRARY
- COIL_LIBRARY OPENRTM_IDL_COMPILER)
-
-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)
- 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 ${OPENRTM_IDL_COMPILER} ${OPENRTM_IDL_FLAGS}
- -I${OPENRTM_IDL_DIR} ${_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)
-
+# Find OpenRTM-aist
+#
+# The following additional directories are searched:
+# OPENRTM_ROOT (CMake variable)
+# OPENRTM_ROOT (Environment variable)
+#
+# This sets the following variables:
+# OPENRTM_FOUND - True if OpenRTM-aist was found.
+# OPENRTM_INCLUDE_DIRS - Directories containing the OpenRTM-aist include files.
+# OPENRTM_LIBRARIES - Libraries needed to use OpenRTM-aist.
+# OPENRTM_CFLAGS - Compiler flags for OpenRTM-aist.
+# OPENRTM_VERSION - The version of OpenRTM-aist found.
+# OPENRTM_VERSION_MAJOR - The major version of OpenRTM-aist found.
+# OPENRTM_VERSION_MINOR - The minor version of OpenRTM-aist found.
+# OPENRTM_VERSION_REVISION - The revision version of OpenRTM-aist found.
+# OPENRTM_VERSION_CANDIDATE - The candidate version of OpenRTM-aist found.
+# OPENRTM_IDL_COMPILER - The IDL compiler used by OpenRTM-aist.
+# OPENRTM_IDL_FLAGS - The flags used to compile OpenRTM-aist IDL files.
+# OPENRTM_IDL_DIR - The directory containing the OpenRTM-aist IDL files.
+#
+# This module also defines one macro usable in your CMakeLists.txt files:
+# OPENRTM_COMPILE_IDL_FILES(file1 file2 ...)
+# Compiles the specified IDL files, placing the generated C++ source files in
+# ${CMAKE_CURRENT_BINARY_DIR}. The source files can be found in file1_SRCS,
+# file2_SRCS, etc., and all source files for all IDL files are available in
+# ALL_IDL_SRCS. To depend on the generated files, depend on the targets
+# file1_TGT, file2_TGT, etc. The target ALL_IDL_TGT is available to depend on
+# all source files generated from IDL files.
+
+find_package(PkgConfig)
+pkg_check_modules(PC_OPENRTM openrtm-aist)
+pkg_check_modules(PC_COIL libcoil)
+pkg_check_modules(PC_OMNIORB4 omniORB4)
+pkg_check_modules(PC_OMNITHREAD3 omnithread3)
+pkg_check_modules(PC_OMNIDYNAMIC4 omniDynamic4)
+if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
+ pkg_check_modules(PC_UUID uuid)
+endif ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
+
+find_path(OPENRTM_INCLUDE_DIR rtm/RTC.h
+ HINTS ${OPENRTM_ROOT}/include ${OPENRTM_ROOT} $ENV{OPENRTM_ROOT}/include ${PC_OPENRTM_INCLUDE_DIRS})
+
+find_path(COIL_INCLUDE_DIR coil/config_coil.h
+ HINTS ${OPENRTM_ROOT}/include $ENV{OPENRTM_ROOT}/include ${PC_COIL_INCLUDE_DIRS})
+
+find_path(OMNIORB4_INCLUDE_DIR omniORB4/omniORB.h
+ HITS ${OMNI_ROOT}/include ${PC_OMNIORB4_INCLUDE_DIRS})
+
+find_library(OPENRTM_LIBRARY RTC
+ HINTS ${OPENRTM_ROOT}/lib $ENV{OPENRTM_ROOT}/lib
+ ${PC_OPENRTM_LIBRARY_DIRS})
+find_library(COIL_LIBRARY coil
+ HINTS ${OPENRTM_ROOT}/lib $ENV{OPENRTM_ROOT}/lib
+ ${PC_COIL_LIBRARY_DIRS})
+find_library(OMNIORB4_LIBRARY omniORB4
+ HINTS ${PC_OMNIORB4_LIBRARY_DIRS})
+find_library(OMNITHREAD3_LIBRARY omnithread
+ HINTS ${PC_OMNITHREAD3_LIBRARY_DIRS})
+find_library(OMNIDYNAMIC4_LIBRARY omniDynamic4
+ HINTS ${PC_OMNIDYNAMIC4_LIBRARY_DIRS})
+if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
+ find_library(UUID_LIBRARY uuid
+ HINTS ${PC_UUID_LIBRARY_DIRS})
+else ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
+ set(UUID_LIBRARY "")
+endif ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
+
+set(OPENRTM_CFLAGS ${PC_OPENRTM_CFLAGS_OTHER} ${PC_COIL_CFLAGS_OTHER} ${PC_OMNIORB4_CFLAGS_OTHER})
+set(OPENRTM_INCLUDE_DIRS ${OPENRTM_INCLUDE_DIR} ${OPENRTM_INCLUDE_DIR}/rtm/idl
+ ${COIL_INCLUDE_DIR} ${OMNIORB4_INCLUDE_DIR})
+set(OPENRTM_LIBRARIES ${OPENRTM_LIBRARY} ${COIL_LIBRARY} ${OMNIORB4_LIBRARY} ${OMNITHREAD3_LIBRARY} ${OMNIDYNAMIC4_LIBRARY} ${UUID_LIBRARY} dl pthread)
+
+file(STRINGS ${OPENRTM_INCLUDE_DIR}/rtm/version.h OPENRTM_VERSION
+ NEWLINE_CONSUME)
+#set(OPENRTM_VERSION "1.1.0")
+string(REGEX MATCH "version = \"([0-9]+)\\.([0-9]+)\\.([0-9]+)-?([a-zA-Z0-9]*)\""
+ OPENRTM_VERSION "${OPENRTM_VERSION}")
+set(OPENRTM_VERSION_MAJOR ${CMAKE_MATCH_1})
+set(OPENRTM_VERSION_MINOR ${CMAKE_MATCH_2})
+set(OPENRTM_VERSION_REVISION ${CMAKE_MATCH_3})
+set(OPENRTM_VERSION_CANDIDATE ${CMAKE_MATCH_4})
+
+execute_process(COMMAND rtm-config --libs-only-l OUTPUT_VARIABLE
+ OPENRTM_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND rtm-config --libs-only-L OUTPUT_VARIABLE
+ OPENRTM_LIBRARY_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND rtm-config --idlc OUTPUT_VARIABLE OPENRTM_IDL_COMPILER
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND rtm-config --idlflags OUTPUT_VARIABLE OPENRTM_IDL_FLAGS
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+separate_arguments(OPENRTM_IDL_FLAGS)
+execute_process(COMMAND rtm-config --prefix OUTPUT_VARIABLE _rtm_prefix
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+set(OPENRTM_IDL_DIR
+ ${_rtm_prefix}/include/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}/rtm/idl
+ CACHE STRING "Directory containing the OpenRTM-aist IDL files.")
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(OpenRTM
+ REQUIRED_VARS OPENRTM_INCLUDE_DIR COIL_INCLUDE_DIR OPENRTM_LIBRARY
+ COIL_LIBRARY OPENRTM_IDL_COMPILER)
+
+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)
+ 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 ${OPENRTM_IDL_COMPILER} ${OPENRTM_IDL_FLAGS}
+ -I${OPENRTM_IDL_DIR} ${_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)
+
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/cpack_options.cmake.in
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/cpack_options.cmake.in 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/cpack_options.cmake.in 2014-03-14 08:18:42 UTC (rev 119)
@@ -1,94 +1,98 @@
-set(CPACK_PACKAGE_NAME "@PROJECT_NAME@")
-set(CPACK_PACKAGE_VERSION_MAJOR "@PROJECT_VERSION_MAJOR@")
-set(CPACK_PACKAGE_VERSION_MINOR "@PROJECT_VERSION_MINOR@")
-set(CPACK_PACKAGE_VERSION_PATCH "@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
-set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
-set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
-
-set(CPACK_COMPONENTS_ALL component)
-set(CPACK_COMPONENT_COMPONENT_DISPLAY_NAME "Applications")
-set(CPACK_COMPONENT_COMPONENT_DESCRIPTION
- "Component library and stand-alone executable")
-if(INSTALL_HEADERS)
- set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} headers)
- set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "Header files")
- set(CPACK_COMPONENT_HEADERS_DESCRIPTION
- "Header files from the component.")
- set(CPACK_COMPONENT_HEADERS_DEPENDS component)
-endif(INSTALL_HEADERS)
-if(INSTALL_IDL)
- set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} idl)
- set(CPACK_COMPONENT_IDL_DISPLAY_NAME "IDL files")
- set(CPACK_COMPONENT_IDL_DESCRIPTION
- "IDL files for the component's services.")
- set(CPACK_COMPONENT_IDL_DEPENDS component)
-endif(INSTALL_IDL)
-set(INSTALL_EXAMPLES @BUILD_EXAMPLES@)
-if(INSTALL_EXAMPLES)
- set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} examples)
- set(CPACK_COMPONENT_EXAMPLES_DISPLAY_NAME "Examples")
- set(CPACK_COMPONENT_EXAMPLES_DESCRIPTION
- "Sample configuration files and other component resources.")
- set(CPACK_COMPONENT_EXAMPLES_DEPENDS component)
-endif(INSTALL_EXAMPLES)
-set(INSTALL_DOCUMENTATION @BUILD_DOCUMENTATION@)
-if(INSTALL_DOCUMENTATION)
- set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} documentation)
- set(CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME "Documentation")
- set(CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION
- "Component documentation")
- set(CPACK_COMPONENT_DOCUMENTATION_DEPENDS component)
-endif(INSTALL_DOCUMENTATION)
-if(INSTALL_SOURCES)
- set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} sources)
- set(CPACK_COMPONENT_SOURCES_DISPLAY_NAME "Source files")
- set(CPACK_COMPONENT_SOURCES_DESCRIPTION
- "Source files from the component.")
-endif(INSTALL_SOURCES)
-
-IF (WIN32)
-
- # Windows WiX package settings
-
- set(CPACK_WIX_XSL "@CMAKE_CURRENT_BINARY_DIR@/wix.xsl")
- set(CPACK_WIX_LANG "ja-jp")
- set(CPACK_RESOURCE_FILE_LICENSE
- "@CMAKE_CURRENT_SOURCE_DIR@/cmake/License.rtf")
- configure_file(
- "@CMAKE_CURRENT_SOURCE_DIR@/cmake/wix.xsl.in"
- "@CMAKE_CURRENT_BINARY_DIR@/wix.xsl" @ONLY)
-
- set(CPACK_PACKAGE_FILE_NAME
- "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-
-
- #
- #
- #
- 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)
- set(CPACK_PACKAGE_EXECUTABLES @PROJECT_EXECUTABLES@)
- if(INSTALL_DOCUMENTATION)
- set(CPACK_NSIS_MENU_LINKS
- "@CMAKE_INSTALL_PREFIX@/share/doc/@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@/html/index.html"
- "Component documentation")
- endif(INSTALL_DOCUMENTATION)
- string(REPLACE "/@PROJECT_NAME@" "" install_prefix_root
- "@CMAKE_INSTALL_PREFIX@")
- file(TO_NATIVE_PATH "${install_prefix_root}" install_prefix_root)
- set(CPACK_NSIS_INSTALL_ROOT "${install_prefix_root}")
- set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS
- " Rename \"$INSTDIR\\share\\@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@\\@PROJECT_NAME_LOWER at -config.cmake\" \"$INSTDIR\\@PROJECT_NAME_LOWER at -config.cmake\"
- Rename \"$INSTDIR\\share\\@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@\\@PROJECT_NAME_LOWER at -config-version.cmake\" \"$INSTDIR\\@PROJECT_NAME_LOWER at -config-version.cmake\"")
- set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS
- " Delete \"$INSTDIR\\@PROJECT_NAME_LOWER at -config.cmake\"
- Delete \"$INSTDIR\\@PROJECT_NAME_LOWER at -config-version.cmake\"")
-ENDIF (WIN32)
-
+set(CPACK_PACKAGE_NAME "@PROJECT_NAME@")
+set(CPACK_PACKAGE_VERSION_MAJOR "@PROJECT_VERSION_MAJOR@")
+set(CPACK_PACKAGE_VERSION_MINOR "@PROJECT_VERSION_MINOR@")
+set(CPACK_PACKAGE_VERSION_PATCH "@PROJECT_VERSION_REVISION@")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
+set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
+set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
+set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
+
+set(CPACK_COMPONENTS_ALL component)
+set(CPACK_COMPONENT_COMPONENT_DISPLAY_NAME "Applications")
+set(CPACK_COMPONENT_COMPONENT_DESCRIPTION
+ "Component library and stand-alone executable")
+if(INSTALL_HEADERS)
+ set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} headers)
+ set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "Header files")
+ set(CPACK_COMPONENT_HEADERS_DESCRIPTION
+ "Header files from the component.")
+ set(CPACK_COMPONENT_HEADERS_DEPENDS component)
+endif(INSTALL_HEADERS)
+if(INSTALL_IDL)
+ set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} idl)
+ set(CPACK_COMPONENT_IDL_DISPLAY_NAME "IDL files")
+ set(CPACK_COMPONENT_IDL_DESCRIPTION
+ "IDL files for the component's services.")
+ set(CPACK_COMPONENT_IDL_DEPENDS component)
+endif(INSTALL_IDL)
+set(INSTALL_EXAMPLES @BUILD_EXAMPLES@)
+if(INSTALL_EXAMPLES)
+ set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} examples)
+ set(CPACK_COMPONENT_EXAMPLES_DISPLAY_NAME "Examples")
+ set(CPACK_COMPONENT_EXAMPLES_DESCRIPTION
+ "Sample configuration files and other component resources.")
+ set(CPACK_COMPONENT_EXAMPLES_DEPENDS component)
+endif(INSTALL_EXAMPLES)
+set(INSTALL_DOCUMENTATION @BUILD_DOCUMENTATION@)
+if(INSTALL_DOCUMENTATION)
+ set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} documentation)
+ set(CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME "Documentation")
+ set(CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION
+ "Component documentation")
+ set(CPACK_COMPONENT_DOCUMENTATION_DEPENDS component)
+endif(INSTALL_DOCUMENTATION)
+if(INSTALL_SOURCES)
+ set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} sources)
+ set(CPACK_COMPONENT_SOURCES_DISPLAY_NAME "Source files")
+ set(CPACK_COMPONENT_SOURCES_DESCRIPTION
+ "Source files from the component.")
+endif(INSTALL_SOURCES)
+
+IF (WIN32)
+
+ # Windows WiX package settings
+
+ set(CPACK_WIX_XSL "@CMAKE_CURRENT_BINARY_DIR@/wix.xsl")
+ set(CPACK_WIX_LANG "ja-jp")
+ set(CPACK_RESOURCE_FILE_LICENSE
+ "@CMAKE_CURRENT_SOURCE_DIR@/cmake/License.rtf")
+ configure_file(
+ "@CMAKE_CURRENT_SOURCE_DIR@/cmake/wix.xsl.in"
+ "@CMAKE_CURRENT_BINARY_DIR@/wix.xsl" @ONLY)
+
+ set(CPACK_PACKAGE_FILE_NAME
+ "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
+
+
+ #
+ #
+ #
+# 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)
+ set(CPACK_PACKAGE_EXECUTABLES @PROJECT_EXECUTABLES@)
+ if(INSTALL_DOCUMENTATION)
+ set(CPACK_NSIS_MENU_LINKS
+ "@CMAKE_INSTALL_PREFIX@/share/doc/@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@/html/index.html"
+ "Component documentation")
+ endif(INSTALL_DOCUMENTATION)
+ string(REPLACE "/@PROJECT_NAME@" "" install_prefix_root
+ "@CMAKE_INSTALL_PREFIX@")
+ file(TO_NATIVE_PATH "${install_prefix_root}" install_prefix_root)
+ set(CPACK_NSIS_INSTALL_ROOT "${install_prefix_root}")
+ set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS
+ " Rename \"$INSTDIR\\share\\@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@\\@PROJECT_NAME_LOWER at -config.cmake\" \"$INSTDIR\\@PROJECT_NAME_LOWER at -config.cmake\"
+ Rename \"$INSTDIR\\share\\@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@\\@PROJECT_NAME_LOWER at -config-version.cmake\" \"$INSTDIR\\@PROJECT_NAME_LOWER at -config-version.cmake\"")
+ 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/ImageCalibration/cmake/imagecalibration-config-version.cmake.in
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/imagecalibration-config-version.cmake.in 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/imagecalibration-config-version.cmake.in 2014-03-14 08:18:42 UTC (rev 119)
@@ -1,10 +1,10 @@
-set(PACKAGE_VERSION @PROJECT_VERSION@)
-if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
- set(PACKAGE_VERSION_COMPATIBLE FALSE)
-else(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
- set(PACKAGE_VERSION_COMPATIBLE TRUE)
- if(PACKAGE_VERSION VERSION_EQUAL PACKAGE_FIND_VERSION)
- set(PACKAGE_VERSION_EXACT TRUE)
- endif(PACKAGE_VERSION VERSION_EQUAL PACKAGE_FIND_VERSION)
-endif(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
-
+set(PACKAGE_VERSION @PROJECT_VERSION@)
+if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+ set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+ set(PACKAGE_VERSION_COMPATIBLE TRUE)
+ if(PACKAGE_VERSION VERSION_EQUAL PACKAGE_FIND_VERSION)
+ set(PACKAGE_VERSION_EXACT TRUE)
+ endif(PACKAGE_VERSION VERSION_EQUAL PACKAGE_FIND_VERSION)
+endif(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/imagecalibration-config.cmake.in
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/imagecalibration-config.cmake.in 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/imagecalibration-config.cmake.in 2014-03-14 08:18:42 UTC (rev 119)
@@ -1,54 +1,54 @@
-# ImageCalibration CMake config file
-#
-# This file sets the following variables:
-# ImageCalibration_FOUND - Always TRUE.
-# ImageCalibration_INCLUDE_DIRS - Directories containing the ImageCalibration include files.
-# ImageCalibration_IDL_DIRS - Directories containing the ImageCalibration IDL files.
-# ImageCalibration_LIBRARIES - Libraries needed to use ImageCalibration.
-# ImageCalibration_DEFINITIONS - Compiler flags for ImageCalibration.
-# ImageCalibration_VERSION - The version of ImageCalibration found.
-# ImageCalibration_VERSION_MAJOR - The major version of ImageCalibration found.
-# ImageCalibration_VERSION_MINOR - The minor version of ImageCalibration found.
-# ImageCalibration_VERSION_REVISION - The revision version of ImageCalibration found.
-# ImageCalibration_VERSION_CANDIDATE - The candidate version of ImageCalibration found.
-
-message(STATUS "Found ImageCalibration- at PROJECT_VERSION@")
-set(ImageCalibration_FOUND TRUE)
-
-find_package(<dependency> REQUIRED)
-
-#set(ImageCalibration_INCLUDE_DIRS
-# "@CMAKE_INSTALL_PREFIX@/include/@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@"
-# ${<dependency>_INCLUDE_DIRS}
-# )
-#
-#set(ImageCalibration_IDL_DIRS
-# "@CMAKE_INSTALL_PREFIX@/include/@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@/idl")
-set(ImageCalibration_INCLUDE_DIRS
- "@CMAKE_INSTALL_PREFIX@/include/@CPACK_PACKAGE_FILE_NAME@"
- ${<dependency>_INCLUDE_DIRS}
- )
-set(ImageCalibration_IDL_DIRS
- "@CMAKE_INSTALL_PREFIX@/include/@CPACK_PACKAGE_FILE_NAME@/idl")
-
-
-if(WIN32)
- set(ImageCalibration_LIBRARIES
- "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@@PROJECT_NAME_LOWER@@CMAKE_STATIC_LIBRARY_SUFFIX@"
- ${<dependency>_LIBRARIES}
- )
-else(WIN32)
- set(ImageCalibration_LIBRARIES
- "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@@PROJECT_NAME_LOWER@@CMAKE_SHARED_LIBRARY_SUFFIX@"
- ${<dependency>_LIBRARIES}
- )
-endif(WIN32)
-
-set(ImageCalibration_DEFINITIONS ${<dependency>_DEFINITIONS})
-
-set(ImageCalibration_VERSION @PROJECT_VERSION@)
-set(ImageCalibration_VERSION_MAJOR @PROJECT_VERSION_MAJOR@)
-set(ImageCalibration_VERSION_MINOR @PROJECT_VERSION_MINOR@)
-set(ImageCalibration_VERSION_REVISION @PROJECT_VERSION_REVISION@)
-set(ImageCalibration_VERSION_CANDIDATE @PROJECT_VERSION_CANDIDATE@)
-
+# ImageCalibration CMake config file
+#
+# This file sets the following variables:
+# ImageCalibration_FOUND - Always TRUE.
+# ImageCalibration_INCLUDE_DIRS - Directories containing the ImageCalibration include files.
+# ImageCalibration_IDL_DIRS - Directories containing the ImageCalibration IDL files.
+# ImageCalibration_LIBRARIES - Libraries needed to use ImageCalibration.
+# ImageCalibration_DEFINITIONS - Compiler flags for ImageCalibration.
+# ImageCalibration_VERSION - The version of ImageCalibration found.
+# ImageCalibration_VERSION_MAJOR - The major version of ImageCalibration found.
+# ImageCalibration_VERSION_MINOR - The minor version of ImageCalibration found.
+# ImageCalibration_VERSION_REVISION - The revision version of ImageCalibration found.
+# ImageCalibration_VERSION_CANDIDATE - The candidate version of ImageCalibration found.
+
+message(STATUS "Found ImageCalibration- at PROJECT_VERSION@")
+set(ImageCalibration_FOUND TRUE)
+
+find_package(<dependency> REQUIRED)
+
+#set(ImageCalibration_INCLUDE_DIRS
+# "@CMAKE_INSTALL_PREFIX@/include/@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@"
+# ${<dependency>_INCLUDE_DIRS}
+# )
+#
+#set(ImageCalibration_IDL_DIRS
+# "@CMAKE_INSTALL_PREFIX@/include/@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@/idl")
+set(ImageCalibration_INCLUDE_DIRS
+ "@CMAKE_INSTALL_PREFIX@/include/@CPACK_PACKAGE_FILE_NAME@"
+ ${<dependency>_INCLUDE_DIRS}
+ )
+set(ImageCalibration_IDL_DIRS
+ "@CMAKE_INSTALL_PREFIX@/include/@CPACK_PACKAGE_FILE_NAME@/idl")
+
+
+if(WIN32)
+ set(ImageCalibration_LIBRARIES
+ "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@@PROJECT_NAME_LOWER@@CMAKE_STATIC_LIBRARY_SUFFIX@"
+ ${<dependency>_LIBRARIES}
+ )
+else(WIN32)
+ set(ImageCalibration_LIBRARIES
+ "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@@PROJECT_NAME_LOWER@@CMAKE_SHARED_LIBRARY_SUFFIX@"
+ ${<dependency>_LIBRARIES}
+ )
+endif(WIN32)
+
+set(ImageCalibration_DEFINITIONS ${<dependency>_DEFINITIONS})
+
+set(ImageCalibration_VERSION @PROJECT_VERSION@)
+set(ImageCalibration_VERSION_MAJOR @PROJECT_VERSION_MAJOR@)
+set(ImageCalibration_VERSION_MINOR @PROJECT_VERSION_MINOR@)
+set(ImageCalibration_VERSION_REVISION @PROJECT_VERSION_REVISION@)
+set(ImageCalibration_VERSION_CANDIDATE @PROJECT_VERSION_CANDIDATE@)
+
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/imagecalibration.pc.in
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/imagecalibration.pc.in 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/imagecalibration.pc.in 2014-03-14 08:18:42 UTC (rev 119)
@@ -1,13 +1,13 @@
-# This file was generated by CMake for @PROJECT_NAME@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=${prefix}/@LIB_INSTALL_DIR@
-includedir=${prefix}/include
-
-Name: @PROJECT_NAME@
-Description: @PROJECT_DESCRIPTION@
-Version: @PROJECT_VERSION@
-Requires: @PKG_DEPS@
-Libs: -L${libdir} @PKG_LIBS@
-Cflags: -I${includedir}/@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@
-
+# This file was generated by CMake for @PROJECT_NAME@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${prefix}/@LIB_INSTALL_DIR@
+includedir=${prefix}/include
+
+Name: @PROJECT_NAME@
+Description: @PROJECT_DESCRIPTION@
+Version: @PROJECT_VERSION@
+Requires: @PKG_DEPS@
+Libs: -L${libdir} @PKG_LIBS@
+Cflags: -I${includedir}/@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@
+
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/uninstall_target.cmake.in
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/uninstall_target.cmake.in 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/uninstall_target.cmake.in 2014-03-14 08:18:42 UTC (rev 119)
@@ -1,18 +1,18 @@
-if(NOT EXISTS "@PROJECT_BINARY_DIR@/install_manifest.txt")
- message(FATAL_ERROR "Cannot find install manifest: \"@PROJECT_BINARY_DIR@/install_manifest.txt\"")
-endif(NOT EXISTS "@PROJECT_BINARY_DIR@/install_manifest.txt")
-
-file(READ "@PROJECT_BINARY_DIR@/install_manifest.txt" files)
-string(REGEX REPLACE "\n" ";" files "${files}")
-foreach(file ${files})
- message(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
- if(EXISTS "$ENV{DESTDIR}${file}")
- exec_program("@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
- OUTPUT_VARIABLE rm_out RETURN_VALUE rm_retval)
- if(NOT "${rm_retval}" STREQUAL 0)
- message(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
- endif(NOT "${rm_retval}" STREQUAL 0)
- else(EXISTS "$ENV{DESTDIR}${file}")
- message(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
- endif(EXISTS "$ENV{DESTDIR}${file}")
-endforeach(file)
+if(NOT EXISTS "@PROJECT_BINARY_DIR@/install_manifest.txt")
+ message(FATAL_ERROR "Cannot find install manifest: \"@PROJECT_BINARY_DIR@/install_manifest.txt\"")
+endif(NOT EXISTS "@PROJECT_BINARY_DIR@/install_manifest.txt")
+
+file(READ "@PROJECT_BINARY_DIR@/install_manifest.txt" files)
+string(REGEX REPLACE "\n" ";" files "${files}")
+foreach(file ${files})
+ message(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
+ if(EXISTS "$ENV{DESTDIR}${file}")
+ exec_program("@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+ OUTPUT_VARIABLE rm_out RETURN_VALUE rm_retval)
+ if(NOT "${rm_retval}" STREQUAL 0)
+ message(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
+ endif(NOT "${rm_retval}" STREQUAL 0)
+ else(EXISTS "$ENV{DESTDIR}${file}")
+ message(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+ endif(EXISTS "$ENV{DESTDIR}${file}")
+endforeach(file)
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/utils.cmake
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/utils.cmake 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/utils.cmake 2014-03-14 08:18:42 UTC (rev 119)
@@ -1,32 +1,32 @@
-# Dissect the version specified in PROJECT_VERSION, placing the major,
-# minor, revision and candidate components in PROJECT_VERSION_MAJOR, etc.
-# _prefix: The prefix string for the version variable names.
-macro(DISSECT_VERSION)
- # Find version components
- string(REGEX REPLACE "^([0-9]+).*" "\\1"
- PROJECT_VERSION_MAJOR "${PROJECT_VERSION}")
- string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*" "\\1"
- PROJECT_VERSION_MINOR "${PROJECT_VERSION}")
- string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1"
- PROJECT_VERSION_REVISION "${PROJECT_VERSION}")
- string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.[0-9]+(.*)" "\\1"
- PROJECT_VERSION_CANDIDATE "${PROJECT_VERSION}")
-endmacro(DISSECT_VERSION)
-
-# Filter a list to remove all strings matching the regex in _pattern. The
-# output is placed in the variable pointed at by _output.
-macro(FILTER_LIST _list _pattern _output)
- set(${_output})
- foreach(_item ${${_list}})
- if("${_item}" MATCHES ${_pattern})
- set(${_output} ${${_output}} ${_item})
- endif("${_item}" MATCHES ${_pattern})
- endforeach(_item)
-endmacro(FILTER_LIST)
-
-macro(MAP_ADD_STR _list _str _output)
- set(${_output})
- foreach(_item ${${_list}})
- set(${_output} ${${_output}} ${_str}${_item})
- endforeach(_item)
-endmacro(MAP_ADD_STR)
+# Dissect the version specified in PROJECT_VERSION, placing the major,
+# minor, revision and candidate components in PROJECT_VERSION_MAJOR, etc.
+# _prefix: The prefix string for the version variable names.
+macro(DISSECT_VERSION)
+ # Find version components
+ string(REGEX REPLACE "^([0-9]+).*" "\\1"
+ PROJECT_VERSION_MAJOR "${PROJECT_VERSION}")
+ string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*" "\\1"
+ PROJECT_VERSION_MINOR "${PROJECT_VERSION}")
+ string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1"
+ PROJECT_VERSION_REVISION "${PROJECT_VERSION}")
+ string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.[0-9]+(.*)" "\\1"
+ PROJECT_VERSION_CANDIDATE "${PROJECT_VERSION}")
+endmacro(DISSECT_VERSION)
+
+# Filter a list to remove all strings matching the regex in _pattern. The
+# output is placed in the variable pointed at by _output.
+macro(FILTER_LIST _list _pattern _output)
+ set(${_output})
+ foreach(_item ${${_list}})
+ if("${_item}" MATCHES ${_pattern})
+ set(${_output} ${${_output}} ${_item})
+ endif("${_item}" MATCHES ${_pattern})
+ endforeach(_item)
+endmacro(FILTER_LIST)
+
+macro(MAP_ADD_STR _list _str _output)
+ set(${_output})
+ foreach(_item ${${_list}})
+ set(${_output} ${${_output}} ${_str}${_item})
+ endforeach(_item)
+endmacro(MAP_ADD_STR)
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/wix.xsl.in
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/wix.xsl.in 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake/wix.xsl.in 2014-03-14 08:18:42 UTC (rev 119)
@@ -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="5C7C744E-8C58-461B-B8C7-A41F898C22EC" Name="@CPACK_PACKAGE_NAME@ @CPACK_PACKAGE_VERSION@" Language="1041" Codepage="932" Version="@CPACK_PACKAGE_VERSION@" Manufacturer="@CPACK_PACKAGE_VENDOR@" UpgradeCode="041C1526-817C-480B-8F6E-55CCF709EDC0">
- <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="7E4FE2E7-63B0-48A5-9BA7-43C156C1E9AC" Name="@CPACK_PACKAGE_NAME@ @CPACK_PACKAGE_VERSION@" Language="1041" Codepage="932" Version="@CPACK_PACKAGE_VERSION@" Manufacturer="@CPACK_PACKAGE_VENDOR@" UpgradeCode="190B1CA1-7D0B-4D00-B756-C86E0586704E">
+ <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/ImageCalibration/doc/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/doc/CMakeLists.txt 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/doc/CMakeLists.txt 2014-03-14 08:18:42 UTC (rev 119)
@@ -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})
- 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)
-
+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})
+ 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)
+
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/doc/conf.py.in
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/doc/conf.py.in 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/doc/conf.py.in 2014-03-14 08:18:42 UTC (rev 119)
@@ -1,216 +1,216 @@
-# -*- coding: utf-8 -*-
-#
-# ImageCalibration documentation build configuration file, created by
-# sphinx-quickstart on Mon Aug 8 11:28:05 2011.
-#
-# This file is execfile()d with the current directory set to its containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys, os
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
-
-# -- General configuration -----------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['breathe']
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix of source filenames.
-source_suffix = '.txt'
-
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = 'index'
-
-# General information about the project.
-project = u'@PROJECT_NAME@'
-copyright = u'@PROJECT_COPYRIGHT_YEAR@, @PROJECT_AUTHOR@'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '@PROJECT_VERSION_MAJOR at .@PROJECT_VERSION_MINOR@'
-# The full version, including alpha/beta/rc tags.
-release = '@PROJECT_VERSION@'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = ['_build']
-
-# The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-
-# -- Options for HTML output ---------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages. See the documentation for
-# a list of builtin themes.
-html_theme = 'default'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further. For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-# The name for this set of Sphinx documents. If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar. Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it. The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = '@PROJECT_NAME at doc'
-
-
-# -- Options for LaTeX output --------------------------------------------------
-
-# The paper size ('letter' or 'a4').
-#latex_paper_size = 'letter'
-
-# The font size ('10pt', '11pt' or '12pt').
-#latex_font_size = '10pt'
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
- ('index', '@PROJECT_NAME at .tex', u'@PROJECT_NAME@ Documentation',
- u'@PROJECT_AUTHOR@', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Additional stuff for the LaTeX preamble.
-#latex_preamble = ''
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output --------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
- ('index', '@PROJECT_NAME@', u'@PROJECT_NAME@ Documentation',
- [u'@PROJECT_AUTHOR@'], 1)
-]
+# -*- coding: utf-8 -*-
+#
+# ImageCalibration documentation build configuration file, created by
+# sphinx-quickstart on Mon Aug 8 11:28:05 2011.
+#
+# This file is execfile()d with the current directory set to its containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys, os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.insert(0, os.path.abspath('.'))
+
+# -- General configuration -----------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be extensions
+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = ['breathe']
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.txt'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'@PROJECT_NAME@'
+copyright = u'@PROJECT_COPYRIGHT_YEAR@, @PROJECT_AUTHOR@'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '@PROJECT_VERSION_MAJOR at .@PROJECT_VERSION_MINOR@'
+# The full version, including alpha/beta/rc tags.
+release = '@PROJECT_VERSION@'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = ['_build']
+
+# The reST default role (used for this markup: `text`) to use for all documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+
+# -- Options for HTML output ---------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages. See the documentation for
+# a list of builtin themes.
+html_theme = 'default'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further. For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents. If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar. Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it. The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = '@PROJECT_NAME at doc'
+
+
+# -- Options for LaTeX output --------------------------------------------------
+
+# The paper size ('letter' or 'a4').
+#latex_paper_size = 'letter'
+
+# The font size ('10pt', '11pt' or '12pt').
+#latex_font_size = '10pt'
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass [howto/manual]).
+latex_documents = [
+ ('index', '@PROJECT_NAME at .tex', u'@PROJECT_NAME@ Documentation',
+ u'@PROJECT_AUTHOR@', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Additional stuff for the LaTeX preamble.
+#latex_preamble = ''
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output --------------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+ ('index', '@PROJECT_NAME@', u'@PROJECT_NAME@ Documentation',
+ [u'@PROJECT_AUTHOR@'], 1)
+]
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/doc/content/index.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/doc/content/index.txt 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/doc/content/index.txt 2014-03-14 08:18:42 UTC (rev 119)
@@ -1,149 +1,145 @@
-ImageCalibrationName - 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
-============
-
-ImageCalibration 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
-``ImageCalibrationComp`` executable. The ``ImageCalibration`` library
-is available for loading into a manager, using the initialisation function
-``ImageCalibrationInit``.
-
-From source
------------
-
-Follow these steps to install ImageCalibration from source in any operating
-system:
-
-- Download the source, either from the repository or a source archive,
- and extract it somewhere::
-
- tar -xvzf ImageCalibration-1.0.0.tar.gz
-
-- Change to the directory containing the extracted source::
-
- cd ImageCalibration-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.
-
-ImageCalibration can be launched in stand-alone mode by executing the
-``ImageCalibrationComp`` executable (installed into ``${prefix}/components/bin``).
-Alternatively, ``libImageCalibration.so`` can be loaded into a manager, using the
-initialisation function ``ImageCalibrationInit``. 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
-================ ================== ================ ======
-board_w int 11
-board_h int 8
-camera_Height float -20
-================ ================== ================ ======
-
-Ports
-=====
-
-The ports provided by the component are described below:
-
-=============== =========== ============================== =======
-Name Type Data type Purpose
-=============== =========== ============================== =======
-inputImage InPort RTC::CameraImage
-key InPort RTC::TimedLong
-orignalImage OutPort RTC::CameraImage
-birdImage OutPort RTC::CameraImage
-internalParameter OutPort RTC::TimedString
-externalParameter OutPort RTC::TimedString
-renseParameter OutPort RTC::TimedString
-=============== =========== ============================== =======
-
-Examples
-========
-
-An example configuration file is provided in the
-``${prefix}/components/share/ImageCalibration/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.
-
+ImageCalibrationName - 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
+============
+
+ImageCalibration 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
+``ImageCalibrationComp`` executable. The ``ImageCalibration`` library
+is available for loading into a manager, using the initialisation function
+``ImageCalibrationInit``.
+
+From source
+-----------
+
+Follow these steps to install ImageCalibration from source in any operating
+system:
+
+- Download the source, either from the repository or a source archive,
+ and extract it somewhere::
+
+ tar -xvzf ImageCalibration-1.0.0.tar.gz
+
+- Change to the directory containing the extracted source::
+
+ cd ImageCalibration-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.
+
+ImageCalibration can be launched in stand-alone mode by executing the
+``ImageCalibrationComp`` executable (installed into ``${prefix}/components/bin``).
+Alternatively, ``libImageCalibration.so`` can be loaded into a manager, using the
+initialisation function ``ImageCalibrationInit``. 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
+================ ================== ================ ======
+checker_w int 13
+checker_h int 9
+image_num int 5
+================ ================== ================ ======
+
+Ports
+=====
+
+The ports provided by the component are described below:
+
+=============== =========== ============================== =======
+Name Type Data type Purpose
+=============== =========== ============================== =======
+original_image InPort RTC::CameraImage
+checker_image OutPort RTC::CameraImage
+CalibrationService ServicePort ImageCalibService::CalibrationService
+=============== =========== ============================== =======
+
+Examples
+========
+
+An example configuration file is provided in the
+``${prefix}/components/share/ImageCalibration/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/ImageCalibration/doc/content/index_j.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/doc/content/index_j.txt 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/doc/content/index_j.txt 2014-03-14 08:18:42 UTC (rev 119)
@@ -1,139 +1,135 @@
-ImageCalibration - 日本語
-=======================
-
-
-ã¯ã˜ã‚ã«
-========
-
-クラスã«ã¤ã„ã¦ã¯ã€ `APIドã‚ュメンテーション`_ ã«å‚ç…§ã—ã¦ãã ã•ã„。
-
-.. _`APIドã‚ュメンテーション`:
- doxygen/html/index.html
-
-æ¡ä»¶
-====
-
-ImageCalibrationã¯OpenRTM-aist 1.0.0以上ã®C++版ãŒå¿…è¦ã§ã™ã€‚
-
-ImageCalibration㯠CMake_ を使ã„ã¾ã™ã€‚CMake 2.8以上ãŒå¿…è¦ã§ã™ã€‚
-
-.. _CMAke:
- http://www.cmake.org
-
-インストール
-============
-
-インストーラ
-------------
-
-Windowsã®ãƒ¦ãƒ¼ã‚¶ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ãƒ‘ッケージを使用ã—ã¦ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’インストール
-ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã“ã‚Œã¯ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆåŠã³ãã®ã™ã¹ã¦ã®å¿…è¦ãªãƒ©ã‚¤ãƒ–ラリを
-インストールã—ã¾ã™ã€‚Windowsã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹å ´åˆã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ã®ä½¿ç”¨ã‚’推奨ã—ã¦ã¾ã™ã€‚
-
-- インストーラをダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã•ã„。
-- インストールを始ã‚ã‚‹ãŸã‚ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ã‚’ダブルクリックã—ã¦ãã ã•ã„。
-- 指示ã«ã—ãŸãŒã£ã¦ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’インストールã—ã¦ãã ã•ã„。
-- 環境変数ã®å¤‰æ›´ã‚’é©ç”¨ã™ã‚‹ãŸã‚ã€ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’使用ã™ã‚‹å‰ã«ã‚³ãƒ³ãƒ”ューターを
- å†èµ·å‹•ã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。
-
-ImageCalibration㯠``ImageCalibrationComp`` ã®å®Ÿè¡Œã‚’ダブルクリックã—ã¦å®Ÿè¡Œã™ã‚‹ã“ã¨ãŒ
-ã§ãã¾ã™ã€‚ã‚ã‚‹ã„ã¯ã€ ``ImageCalibration`` ã‚’åˆæœŸåŒ–関数㮠``ImageCalibrationInit`` を利用ã—ã¦ã€
-マãƒãƒ¼ã‚¸ãƒ£ã«ãƒãƒ¼ãƒ‰ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
-
-ソースã‹ã‚‰
-----------
-
-ソースを使ã†å ´åˆã¯ä»¥ä¸‹ã®æ‰‹é †ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•ã„。
-
-- ソースをダウンãƒãƒ¼ãƒ‰ã—ã¦è§£å‡ã—ã¦ãã ã•ã„::
-
- tar -xvzf ImageCalibration-1.0.0.tar.gz
-
-- 解å‡ã•ã‚ŒãŸãƒ•ã‚©ãƒ«ãƒ€ã«å…¥ã£ã¦ãã ã•ã„::
-
- cd ImageCalibration-1.0.0
-
-- ``build`` フォルダを作ã£ã¦ãã ã•ã„::
-
- mkdir build
-
-- `` build`` フォルダã«å…¥ã£ã¦ãã ã•ã„::
-
- cd build
-
-- CMakeを実行ã—ã¦ãã ã•ã„::
-
- cmake ../
-
-- エラーãŒå‡ºç„¡ã„å ´åˆã€makeを実行ã—ã¦ãã ã•ã„::
-
- make
-
-- ``make install`` ã§ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’インストールã—ã¦ãã ã•ã„。é¸æŠžã•ã‚ŒãŸ
- ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å ´æ‰€ã«æ›¸ãè¾¼ã¿æ¨©é™ãŒã‚ã‚‹ã‹ã‚’確èªã—ã¦ãã ã•ã„::
-
- ``make install``
-
-- インストールã™ã‚‹å ´æ‰€ã¯ccmakeを実行ã—㦠``CMAKE_INSTALL_PREFIX`` ã‚’
- è¨å®šã™ã‚‹ã“ã¨ã§å¤‰æ›´ãŒå¯èƒ½ã§ã™ã€‚
-
- ccmake ../
-
-ã“ã“ã¾ã§ã§ã€ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆãŒä½¿ãˆã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã—ãŸã€‚コンフィグレーションã¯æ¬¡ã®ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã‚’
-å‚ç…§ã—ã¦ãã ã•ã„。
-
-ImageCalibration㯠``ImageCalibrationComp`` を実行（ ``${prefix}/components/bin`` ã«
-インストールã•ã‚Œã¾ã™ï¼‰ã™ã‚‹ã“ã¨ã§ã‚¹ã‚¿ãƒ³ãƒ‰ã‚¢ãƒãƒ¼ãƒ³ãƒ¢ãƒ¼ãƒ‰ã§å®Ÿè¡Œã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
-ã‚ã‚‹ã„ã¯ã€ ``libImageCalibration.so`` ã‚’åˆæœŸåŒ–関数㮠``ImageCalibrationInit`` を利用ã—ã¦ã€
-マãƒãƒ¼ã‚¸ãƒ£ã«ãƒãƒ¼ãƒ‰ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã“ã®ãƒ©ã‚¤ãƒ–ラリ㯠``${prefix}/components/lib``
-ã¾ãŸã¯ ``${prefix}/components/lib64`` ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™ã€‚
-
-
-コンフィグレーション
-====================
-
-使ãˆã‚‹ã‚³ãƒ³ãƒ•ã‚£ã‚°ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ãƒ‘ラメータã¯ä»¥ä¸‹ã®ãƒ†ãƒ¼ãƒ–ルをå‚ç…§
-ã—ã¦ãã ã•ã„。
-
-================ ================== ================ ====
-パラメータ データ型 デフォルト値 æ„味
-================ ================== ================ ====
-board_w int 11
-board_h int 8
-camera_Height float -20
-================ ================== ================ ====
-
-ãƒãƒ¼ãƒˆ
-======
-
-コンãƒãƒ¼ãƒãƒ³ãƒˆã«ã‚ˆã£ã¦æä¾›ã•ã‚Œã‚‹ãƒãƒ¼ãƒˆã¯ä»¥ä¸‹ã®ãƒ†ãƒ¼ãƒ–ルã§è¿°ã¹ã‚‰ã‚Œã¦ã„ã¾ã™ã€‚
-
-=============== =========== ============================== ====
-ãƒãƒ¼ãƒˆå ãƒãƒ¼ãƒˆåž‹ データ型 æ„味
-=============== =========== ============================== ====
-inputImage InPort RTC::CameraImage
-key InPort RTC::TimedLong
-orignalImage OutPort RTC::CameraImage
-birdImage OutPort RTC::CameraImage
-internalParameter OutPort RTC::TimedString
-externalParameter OutPort RTC::TimedString
-renseParameter OutPort RTC::TimedString
-=============== =========== ============================== ====
-
-例
-==
-
-例ã®rtc.confファイル㯠``${prefix}/components/share/ImageCalibration/examples/conf/``
-フォルダã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™ã€‚
-
-Changelog
-=========
-
-
-License
-=======
-
-ã“ã®ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¯ç”£æ¥æŠ€è¡“ç·åˆç ”究所ã§é–‹ç™ºã•ã‚Œã¦ã„ã¾ã™ã€‚承èªç•ªå·ã¯H23PRO-????
-ã§ã™ã€‚ã“ã®ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¯ Lesser General Public License (LGPL) ライセンスã¨ã—ã¦
-公開ã•ã‚Œã¦ã¾ã™ã€‚COPYING.LESSER ã‚’å‚ç…§ã—ã¦ãã ã•ã„。
-
+ImageCalibration - 日本語
+=======================
+
+
+ã¯ã˜ã‚ã«
+========
+
+クラスã«ã¤ã„ã¦ã¯ã€ `APIドã‚ュメンテーション`_ ã«å‚ç…§ã—ã¦ãã ã•ã„。
+
+.. _`APIドã‚ュメンテーション`:
+ doxygen/html/index.html
+
+æ¡ä»¶
+====
+
+ImageCalibrationã¯OpenRTM-aist 1.0.0以上ã®C++版ãŒå¿…è¦ã§ã™ã€‚
+
+ImageCalibration㯠CMake_ を使ã„ã¾ã™ã€‚CMake 2.8以上ãŒå¿…è¦ã§ã™ã€‚
+
+.. _CMAke:
+ http://www.cmake.org
+
+インストール
+============
+
+インストーラ
+------------
+
+Windowsã®ãƒ¦ãƒ¼ã‚¶ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ãƒ‘ッケージを使用ã—ã¦ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’インストール
+ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã“ã‚Œã¯ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆåŠã³ãã®ã™ã¹ã¦ã®å¿…è¦ãªãƒ©ã‚¤ãƒ–ラリを
+インストールã—ã¾ã™ã€‚Windowsã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹å ´åˆã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ã®ä½¿ç”¨ã‚’推奨ã—ã¦ã¾ã™ã€‚
+
+- インストーラをダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã•ã„。
+- インストールを始ã‚ã‚‹ãŸã‚ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ã‚’ダブルクリックã—ã¦ãã ã•ã„。
+- 指示ã«ã—ãŸãŒã£ã¦ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’インストールã—ã¦ãã ã•ã„。
+- 環境変数ã®å¤‰æ›´ã‚’é©ç”¨ã™ã‚‹ãŸã‚ã€ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’使用ã™ã‚‹å‰ã«ã‚³ãƒ³ãƒ”ューターを
+ å†èµ·å‹•ã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。
+
+ImageCalibration㯠``ImageCalibrationComp`` ã®å®Ÿè¡Œã‚’ダブルクリックã—ã¦å®Ÿè¡Œã™ã‚‹ã“ã¨ãŒ
+ã§ãã¾ã™ã€‚ã‚ã‚‹ã„ã¯ã€ ``ImageCalibration`` ã‚’åˆæœŸåŒ–関数㮠``ImageCalibrationInit`` を利用ã—ã¦ã€
+マãƒãƒ¼ã‚¸ãƒ£ã«ãƒãƒ¼ãƒ‰ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
+
+ソースã‹ã‚‰
+----------
+
+ソースを使ã†å ´åˆã¯ä»¥ä¸‹ã®æ‰‹é †ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•ã„。
+
+- ソースをダウンãƒãƒ¼ãƒ‰ã—ã¦è§£å‡ã—ã¦ãã ã•ã„::
+
+ tar -xvzf ImageCalibration-1.0.0.tar.gz
+
+- 解å‡ã•ã‚ŒãŸãƒ•ã‚©ãƒ«ãƒ€ã«å…¥ã£ã¦ãã ã•ã„::
+
+ cd ImageCalibration-1.0.0
+
+- ``build`` フォルダを作ã£ã¦ãã ã•ã„::
+
+ mkdir build
+
+- `` build`` フォルダã«å…¥ã£ã¦ãã ã•ã„::
+
+ cd build
+
+- CMakeを実行ã—ã¦ãã ã•ã„::
+
+ cmake ../
+
+- エラーãŒå‡ºç„¡ã„å ´åˆã€makeを実行ã—ã¦ãã ã•ã„::
+
+ make
+
+- ``make install`` ã§ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’インストールã—ã¦ãã ã•ã„。é¸æŠžã•ã‚ŒãŸ
+ ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å ´æ‰€ã«æ›¸ãè¾¼ã¿æ¨©é™ãŒã‚ã‚‹ã‹ã‚’確èªã—ã¦ãã ã•ã„::
+
+ ``make install``
+
+- インストールã™ã‚‹å ´æ‰€ã¯ccmakeを実行ã—㦠``CMAKE_INSTALL_PREFIX`` ã‚’
+ è¨å®šã™ã‚‹ã“ã¨ã§å¤‰æ›´ãŒå¯èƒ½ã§ã™ã€‚
+
+ ccmake ../
+
+ã“ã“ã¾ã§ã§ã€ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆãŒä½¿ãˆã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã—ãŸã€‚コンフィグレーションã¯æ¬¡ã®ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã‚’
+å‚ç…§ã—ã¦ãã ã•ã„。
+
+ImageCalibration㯠``ImageCalibrationComp`` を実行（ ``${prefix}/components/bin`` ã«
+インストールã•ã‚Œã¾ã™ï¼‰ã™ã‚‹ã“ã¨ã§ã‚¹ã‚¿ãƒ³ãƒ‰ã‚¢ãƒãƒ¼ãƒ³ãƒ¢ãƒ¼ãƒ‰ã§å®Ÿè¡Œã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
+ã‚ã‚‹ã„ã¯ã€ ``libImageCalibration.so`` ã‚’åˆæœŸåŒ–関数㮠``ImageCalibrationInit`` を利用ã—ã¦ã€
+マãƒãƒ¼ã‚¸ãƒ£ã«ãƒãƒ¼ãƒ‰ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã“ã®ãƒ©ã‚¤ãƒ–ラリ㯠``${prefix}/components/lib``
+ã¾ãŸã¯ ``${prefix}/components/lib64`` ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™ã€‚
+
+
+コンフィグレーション
+====================
+
+使ãˆã‚‹ã‚³ãƒ³ãƒ•ã‚£ã‚°ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ãƒ‘ラメータã¯ä»¥ä¸‹ã®ãƒ†ãƒ¼ãƒ–ルをå‚ç…§
+ã—ã¦ãã ã•ã„。
+
+================ ================== ================ ====
+パラメータ データ型 デフォルト値 æ„味
+================ ================== ================ ====
+checker_w int 13
+checker_h int 9
+image_num int 5
+================ ================== ================ ====
+
+ãƒãƒ¼ãƒˆ
+======
+
+コンãƒãƒ¼ãƒãƒ³ãƒˆã«ã‚ˆã£ã¦æä¾›ã•ã‚Œã‚‹ãƒãƒ¼ãƒˆã¯ä»¥ä¸‹ã®ãƒ†ãƒ¼ãƒ–ルã§è¿°ã¹ã‚‰ã‚Œã¦ã„ã¾ã™ã€‚
+
+=============== =========== ============================== ====
+ãƒãƒ¼ãƒˆå ãƒãƒ¼ãƒˆåž‹ データ型 æ„味
+=============== =========== ============================== ====
+original_image InPort RTC::CameraImage
+checker_image OutPort RTC::CameraImage
+CalibrationService ServicePort ImageCalibService::CalibrationService
+=============== =========== ============================== ====
+
+例
+==
+
+例ã®rtc.confファイル㯠``${prefix}/components/share/ImageCalibration/examples/conf/``
+フォルダã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™ã€‚
+
+Changelog
+=========
+
+
+License
+=======
+
+ã“ã®ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¯ç”£æ¥æŠ€è¡“ç·åˆç ”究所ã§é–‹ç™ºã•ã‚Œã¦ã„ã¾ã™ã€‚承èªç•ªå·ã¯H23PRO-????
+ã§ã™ã€‚ã“ã®ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¯ Lesser General Public License (LGPL) ライセンスã¨ã—ã¦
+公開ã•ã‚Œã¦ã¾ã™ã€‚COPYING.LESSER ã‚’å‚ç…§ã—ã¦ãã ã•ã„。
+
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/doc/doxyfile.in
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/doc/doxyfile.in 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/doc/doxyfile.in 2014-03-14 08:18:42 UTC (rev 119)
@@ -1,297 +1,297 @@
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-DOXYFILE_ENCODING = UTF-8
-PROJECT_NAME = "@PROJECT_NAME@"
-PROJECT_NUMBER = @PROJECT_VERSION@
-OUTPUT_DIRECTORY = "@doxygen_dir@"
-CREATE_SUBDIRS = NO
-OUTPUT_LANGUAGE = English
-BRIEF_MEMBER_DESC = YES
-REPEAT_BRIEF = YES
-ABBREVIATE_BRIEF = "The $name class" \
- "The $name widget" \
- "The $name file" \
- is \
- provides \
- specifies \
- contains \
- represents \
- a \
- an \
- the
-ALWAYS_DETAILED_SEC = NO
-INLINE_INHERITED_MEMB = NO
-FULL_PATH_NAMES = YES
-STRIP_FROM_PATH =
-STRIP_FROM_INC_PATH = @PROJECT_SOURCE_DIR@/include
-SHORT_NAMES = NO
-JAVADOC_AUTOBRIEF = YES
-QT_AUTOBRIEF = NO
-MULTILINE_CPP_IS_BRIEF = NO
-INHERIT_DOCS = YES
-SEPARATE_MEMBER_PAGES = NO
-TAB_SIZE = 2
-ALIASES =
-OPTIMIZE_OUTPUT_FOR_C = NO
-OPTIMIZE_OUTPUT_JAVA = NO
-OPTIMIZE_FOR_FORTRAN = NO
-OPTIMIZE_OUTPUT_VHDL = NO
-EXTENSION_MAPPING =
-BUILTIN_STL_SUPPORT = NO
-CPP_CLI_SUPPORT = NO
-SIP_SUPPORT = NO
-IDL_PROPERTY_SUPPORT = YES
-DISTRIBUTE_GROUP_DOC = NO
-SUBGROUPING = YES
-TYPEDEF_HIDES_STRUCT = NO
-SYMBOL_CACHE_SIZE = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL = YES
-EXTRACT_PRIVATE = NO
-EXTRACT_STATIC = NO
-EXTRACT_LOCAL_CLASSES = YES
-EXTRACT_LOCAL_METHODS = NO
-EXTRACT_ANON_NSPACES = NO
-HIDE_UNDOC_MEMBERS = NO
-HIDE_UNDOC_CLASSES = NO
-HIDE_FRIEND_COMPOUNDS = NO
-HIDE_IN_BODY_DOCS = NO
-INTERNAL_DOCS = NO
-CASE_SENSE_NAMES = NO
-HIDE_SCOPE_NAMES = NO
-SHOW_INCLUDE_FILES = YES
-FORCE_LOCAL_INCLUDES = NO
-INLINE_INFO = YES
-SORT_MEMBER_DOCS = YES
-SORT_BRIEF_DOCS = NO
-SORT_MEMBERS_CTORS_1ST = NO
-SORT_GROUP_NAMES = NO
-SORT_BY_SCOPE_NAME = NO
-GENERATE_TODOLIST = YES
-GENERATE_TESTLIST = YES
-GENERATE_BUGLIST = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS =
-MAX_INITIALIZER_LINES = 30
-SHOW_USED_FILES = YES
-SHOW_DIRECTORIES = YES
-SHOW_FILES = YES
-SHOW_NAMESPACES = YES
-FILE_VERSION_FILTER =
-LAYOUT_FILE =
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET = YES
-WARNINGS = YES
-WARN_IF_UNDOCUMENTED = YES
-WARN_IF_DOC_ERROR = YES
-WARN_NO_PARAMDOC = NO
-WARN_FORMAT = "$file:$line: $text"
-WARN_LOGFILE =
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT = "@PROJECT_SOURCE_DIR@" \
- "@PROJECT_SOURCE_DIR@/doc"
-INPUT_ENCODING = UTF-8
-FILE_PATTERNS = *.h \
- *.hpp \
- *.doxy
-RECURSIVE = YES
-EXCLUDE = "@PROJECT_SOURCE_DIR@/cmake" \
- "@PROJECT_SOURCE_DIR@/build"
-EXCLUDE_SYMLINKS = YES
-EXCLUDE_PATTERNS =
-EXCLUDE_SYMBOLS =
-EXAMPLE_PATH =
-EXAMPLE_PATTERNS = *
-EXAMPLE_RECURSIVE = NO
-IMAGE_PATH =
-INPUT_FILTER =
-FILTER_PATTERNS =
-FILTER_SOURCE_FILES = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER = YES
-INLINE_SOURCES = NO
-STRIP_CODE_COMMENTS = YES
-REFERENCED_BY_RELATION = NO
-REFERENCES_RELATION = NO
-REFERENCES_LINK_SOURCE = YES
-USE_HTAGS = NO
-VERBATIM_HEADERS = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX = YES
-COLS_IN_ALPHA_INDEX = 5
-IGNORE_PREFIX =
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML = YES
-HTML_OUTPUT = html
-HTML_FILE_EXTENSION = .html
-HTML_HEADER =
-HTML_FOOTER =
-HTML_STYLESHEET =
-HTML_COLORSTYLE_HUE = 220
-HTML_COLORSTYLE_SAT = 100
-HTML_COLORSTYLE_GAMMA = 80
-HTML_TIMESTAMP = YES
-HTML_ALIGN_MEMBERS = YES
-HTML_DYNAMIC_SECTIONS = NO
-GENERATE_DOCSET = YES
-DOCSET_FEEDNAME = "Doxygen generated docs"
-DOCSET_BUNDLE_ID = @PROJECT_NAME_LOWER at .@PROJECT_AUTHOR_SHORT@
-DOCSET_PUBLISHER_ID = @PROJECT_NAME_LOWER at .@PROJECT_AUTHOR_SHORT at .Publisher
-DOCSET_PUBLISHER_NAME = @PROJECT_AUTHOR@/@PROJECT_VENDOR@
-GENERATE_HTMLHELP = YES
-CHM_FILE = "@PROJECT_NAME at -@PROJECT_VERSION_MAJOR at .@PROJECT_VERSION_MINOR at .chm"
-HHC_LOCATION = "@HTML_HELP_COMPILER@"
-GENERATE_CHI = NO
-CHM_INDEX_ENCODING =
-BINARY_TOC = NO
-TOC_EXPAND = NO
-GENERATE_QHP = NO
-QCH_FILE =
-QHP_NAMESPACE = @PROJECT_NAME_LOWER at .@PROJECT_AUTHOR_SHORT at .Project
-QHP_VIRTUAL_FOLDER = doc
-QHP_CUST_FILTER_NAME =
-QHP_CUST_FILTER_ATTRS =
-QHP_SECT_FILTER_ATTRS =
-QHG_LOCATION =
-GENERATE_ECLIPSEHELP = NO
-ECLIPSE_DOC_ID = @PROJECT_NAME_LOWER at .@PROJECT_AUTHOR_SHORT at .Project
-DISABLE_INDEX = NO
-ENUM_VALUES_PER_LINE = 4
-GENERATE_TREEVIEW = NO
-USE_INLINE_TREES = NO
-TREEVIEW_WIDTH = 250
-EXT_LINKS_IN_WINDOW = NO
-FORMULA_FONTSIZE = 10
-FORMULA_TRANSPARENT = YES
-SEARCHENGINE = YES
-SERVER_BASED_SEARCH = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX = NO
-LATEX_OUTPUT = latex
-LATEX_CMD_NAME = latex
-MAKEINDEX_CMD_NAME = makeindex
-COMPACT_LATEX = NO
-PAPER_TYPE = a4wide
-EXTRA_PACKAGES =
-LATEX_HEADER =
-PDF_HYPERLINKS = YES
-USE_PDFLATEX = YES
-LATEX_BATCHMODE = NO
-LATEX_HIDE_INDICES = NO
-LATEX_SOURCE_CODE = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF = NO
-RTF_OUTPUT = rtf
-COMPACT_RTF = NO
-RTF_HYPERLINKS = NO
-RTF_STYLESHEET_FILE =
-RTF_EXTENSIONS_FILE =
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN = NO
-MAN_OUTPUT = man
-MAN_EXTENSION = .3
-MAN_LINKS = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML = NO
-XML_OUTPUT = xml
-XML_SCHEMA =
-XML_DTD =
-XML_PROGRAMLISTING = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD = NO
-PERLMOD_LATEX = NO
-PERLMOD_PRETTY = YES
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING = YES
-MACRO_EXPANSION = NO
-EXPAND_ONLY_PREDEF = NO
-SEARCH_INCLUDES = YES
-INCLUDE_PATH =
-INCLUDE_FILE_PATTERNS = *.h
-PREDEFINED =
-EXPAND_AS_DEFINED =
-SKIP_FUNCTION_MACROS = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-TAGFILES =
-GENERATE_TAGFILE =
-ALLEXTERNALS = NO
-EXTERNAL_GROUPS = YES
-PERL_PATH = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS = YES
-MSCGEN_PATH =
-HIDE_UNDOC_RELATIONS = YES
-HAVE_DOT = YES
-DOT_NUM_THREADS = 0
-DOT_FONTNAME = FreeSans.ttf
-DOT_FONTSIZE = 10
-DOT_FONTPATH =
-CLASS_GRAPH = YES
-COLLABORATION_GRAPH = YES
-GROUP_GRAPHS = YES
-UML_LOOK = NO
-TEMPLATE_RELATIONS = NO
-INCLUDE_GRAPH = YES
-INCLUDED_BY_GRAPH = YES
-CALL_GRAPH = NO
-CALLER_GRAPH = NO
-GRAPHICAL_HIERARCHY = YES
-DIRECTORY_GRAPH = YES
-DOT_IMAGE_FORMAT = png
-DOT_PATH =
-DOTFILE_DIRS =
-DOT_GRAPH_MAX_NODES = 50
-MAX_DOT_GRAPH_DEPTH = 0
-DOT_TRANSPARENT = NO
-DOT_MULTI_TARGETS = NO
-GENERATE_LEGEND = YES
-DOT_CLEANUP = YES
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+DOXYFILE_ENCODING = UTF-8
+PROJECT_NAME = "@PROJECT_NAME@"
+PROJECT_NUMBER = @PROJECT_VERSION@
+OUTPUT_DIRECTORY = "@doxygen_dir@"
+CREATE_SUBDIRS = NO
+OUTPUT_LANGUAGE = English
+BRIEF_MEMBER_DESC = YES
+REPEAT_BRIEF = YES
+ABBREVIATE_BRIEF = "The $name class" \
+ "The $name widget" \
+ "The $name file" \
+ is \
+ provides \
+ specifies \
+ contains \
+ represents \
+ a \
+ an \
+ the
+ALWAYS_DETAILED_SEC = NO
+INLINE_INHERITED_MEMB = NO
+FULL_PATH_NAMES = YES
+STRIP_FROM_PATH =
+STRIP_FROM_INC_PATH = @PROJECT_SOURCE_DIR@/include
+SHORT_NAMES = NO
+JAVADOC_AUTOBRIEF = YES
+QT_AUTOBRIEF = NO
+MULTILINE_CPP_IS_BRIEF = NO
+INHERIT_DOCS = YES
+SEPARATE_MEMBER_PAGES = NO
+TAB_SIZE = 2
+ALIASES =
+OPTIMIZE_OUTPUT_FOR_C = NO
+OPTIMIZE_OUTPUT_JAVA = NO
+OPTIMIZE_FOR_FORTRAN = NO
+OPTIMIZE_OUTPUT_VHDL = NO
+EXTENSION_MAPPING =
+BUILTIN_STL_SUPPORT = NO
+CPP_CLI_SUPPORT = NO
+SIP_SUPPORT = NO
+IDL_PROPERTY_SUPPORT = YES
+DISTRIBUTE_GROUP_DOC = NO
+SUBGROUPING = YES
+TYPEDEF_HIDES_STRUCT = NO
+SYMBOL_CACHE_SIZE = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL = YES
+EXTRACT_PRIVATE = NO
+EXTRACT_STATIC = NO
+EXTRACT_LOCAL_CLASSES = YES
+EXTRACT_LOCAL_METHODS = NO
+EXTRACT_ANON_NSPACES = NO
+HIDE_UNDOC_MEMBERS = NO
+HIDE_UNDOC_CLASSES = NO
+HIDE_FRIEND_COMPOUNDS = NO
+HIDE_IN_BODY_DOCS = NO
+INTERNAL_DOCS = NO
+CASE_SENSE_NAMES = NO
+HIDE_SCOPE_NAMES = NO
+SHOW_INCLUDE_FILES = YES
+FORCE_LOCAL_INCLUDES = NO
+INLINE_INFO = YES
+SORT_MEMBER_DOCS = YES
+SORT_BRIEF_DOCS = NO
+SORT_MEMBERS_CTORS_1ST = NO
+SORT_GROUP_NAMES = NO
+SORT_BY_SCOPE_NAME = NO
+GENERATE_TODOLIST = YES
+GENERATE_TESTLIST = YES
+GENERATE_BUGLIST = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS =
+MAX_INITIALIZER_LINES = 30
+SHOW_USED_FILES = YES
+SHOW_DIRECTORIES = YES
+SHOW_FILES = YES
+SHOW_NAMESPACES = YES
+FILE_VERSION_FILTER =
+LAYOUT_FILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET = YES
+WARNINGS = YES
+WARN_IF_UNDOCUMENTED = YES
+WARN_IF_DOC_ERROR = YES
+WARN_NO_PARAMDOC = NO
+WARN_FORMAT = "$file:$line: $text"
+WARN_LOGFILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT = "@PROJECT_SOURCE_DIR@" \
+ "@PROJECT_SOURCE_DIR@/doc"
+INPUT_ENCODING = UTF-8
+FILE_PATTERNS = *.h \
+ *.hpp \
+ *.doxy
+RECURSIVE = YES
+EXCLUDE = "@PROJECT_SOURCE_DIR@/cmake" \
+ "@PROJECT_SOURCE_DIR@/build"
+EXCLUDE_SYMLINKS = YES
+EXCLUDE_PATTERNS =
+EXCLUDE_SYMBOLS =
+EXAMPLE_PATH =
+EXAMPLE_PATTERNS = *
+EXAMPLE_RECURSIVE = NO
+IMAGE_PATH =
+INPUT_FILTER =
+FILTER_PATTERNS =
+FILTER_SOURCE_FILES = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER = YES
+INLINE_SOURCES = NO
+STRIP_CODE_COMMENTS = YES
+REFERENCED_BY_RELATION = NO
+REFERENCES_RELATION = NO
+REFERENCES_LINK_SOURCE = YES
+USE_HTAGS = NO
+VERBATIM_HEADERS = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX = YES
+COLS_IN_ALPHA_INDEX = 5
+IGNORE_PREFIX =
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML = YES
+HTML_OUTPUT = html
+HTML_FILE_EXTENSION = .html
+HTML_HEADER =
+HTML_FOOTER =
+HTML_STYLESHEET =
+HTML_COLORSTYLE_HUE = 220
+HTML_COLORSTYLE_SAT = 100
+HTML_COLORSTYLE_GAMMA = 80
+HTML_TIMESTAMP = YES
+HTML_ALIGN_MEMBERS = YES
+HTML_DYNAMIC_SECTIONS = NO
+GENERATE_DOCSET = YES
+DOCSET_FEEDNAME = "Doxygen generated docs"
+DOCSET_BUNDLE_ID = @PROJECT_NAME_LOWER at .@PROJECT_AUTHOR_SHORT@
+DOCSET_PUBLISHER_ID = @PROJECT_NAME_LOWER at .@PROJECT_AUTHOR_SHORT at .Publisher
+DOCSET_PUBLISHER_NAME = @PROJECT_AUTHOR@/@PROJECT_VENDOR@
+GENERATE_HTMLHELP = YES
+CHM_FILE = "@PROJECT_NAME at -@PROJECT_VERSION_MAJOR at .@PROJECT_VERSION_MINOR at .chm"
+HHC_LOCATION = "@HTML_HELP_COMPILER@"
+GENERATE_CHI = NO
+CHM_INDEX_ENCODING =
+BINARY_TOC = NO
+TOC_EXPAND = NO
+GENERATE_QHP = NO
+QCH_FILE =
+QHP_NAMESPACE = @PROJECT_NAME_LOWER at .@PROJECT_AUTHOR_SHORT at .Project
+QHP_VIRTUAL_FOLDER = doc
+QHP_CUST_FILTER_NAME =
+QHP_CUST_FILTER_ATTRS =
+QHP_SECT_FILTER_ATTRS =
+QHG_LOCATION =
+GENERATE_ECLIPSEHELP = NO
+ECLIPSE_DOC_ID = @PROJECT_NAME_LOWER at .@PROJECT_AUTHOR_SHORT at .Project
+DISABLE_INDEX = NO
+ENUM_VALUES_PER_LINE = 4
+GENERATE_TREEVIEW = NO
+USE_INLINE_TREES = NO
+TREEVIEW_WIDTH = 250
+EXT_LINKS_IN_WINDOW = NO
+FORMULA_FONTSIZE = 10
+FORMULA_TRANSPARENT = YES
+SEARCHENGINE = YES
+SERVER_BASED_SEARCH = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX = NO
+LATEX_OUTPUT = latex
+LATEX_CMD_NAME = latex
+MAKEINDEX_CMD_NAME = makeindex
+COMPACT_LATEX = NO
+PAPER_TYPE = a4wide
+EXTRA_PACKAGES =
+LATEX_HEADER =
+PDF_HYPERLINKS = YES
+USE_PDFLATEX = YES
+LATEX_BATCHMODE = NO
+LATEX_HIDE_INDICES = NO
+LATEX_SOURCE_CODE = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF = NO
+RTF_OUTPUT = rtf
+COMPACT_RTF = NO
+RTF_HYPERLINKS = NO
+RTF_STYLESHEET_FILE =
+RTF_EXTENSIONS_FILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN = NO
+MAN_OUTPUT = man
+MAN_EXTENSION = .3
+MAN_LINKS = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML = NO
+XML_OUTPUT = xml
+XML_SCHEMA =
+XML_DTD =
+XML_PROGRAMLISTING = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD = NO
+PERLMOD_LATEX = NO
+PERLMOD_PRETTY = YES
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING = YES
+MACRO_EXPANSION = NO
+EXPAND_ONLY_PREDEF = NO
+SEARCH_INCLUDES = YES
+INCLUDE_PATH =
+INCLUDE_FILE_PATTERNS = *.h
+PREDEFINED =
+EXPAND_AS_DEFINED =
+SKIP_FUNCTION_MACROS = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+TAGFILES =
+GENERATE_TAGFILE =
+ALLEXTERNALS = NO
+EXTERNAL_GROUPS = YES
+PERL_PATH = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS = YES
+MSCGEN_PATH =
+HIDE_UNDOC_RELATIONS = YES
+HAVE_DOT = YES
+DOT_NUM_THREADS = 0
+DOT_FONTNAME = FreeSans.ttf
+DOT_FONTSIZE = 10
+DOT_FONTPATH =
+CLASS_GRAPH = YES
+COLLABORATION_GRAPH = YES
+GROUP_GRAPHS = YES
+UML_LOOK = NO
+TEMPLATE_RELATIONS = NO
+INCLUDE_GRAPH = YES
+INCLUDED_BY_GRAPH = YES
+CALL_GRAPH = NO
+CALLER_GRAPH = NO
+GRAPHICAL_HIERARCHY = YES
+DIRECTORY_GRAPH = YES
+DOT_IMAGE_FORMAT = png
+DOT_PATH =
+DOTFILE_DIRS =
+DOT_GRAPH_MAX_NODES = 50
+MAX_DOT_GRAPH_DEPTH = 0
+DOT_TRANSPARENT = NO
+DOT_MULTI_TARGETS = NO
+GENERATE_LEGEND = YES
+DOT_CLEANUP = YES
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/idl/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/idl/CMakeLists.txt 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/idl/CMakeLists.txt 2014-03-14 08:18:42 UTC (rev 119)
@@ -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)
-FILTER_LIST("${ALL_IDL_SRCS}" "hh$" idl_headers)
-install(FILES ${idl_headers}
- DESTINATION ${INC_INSTALL_DIR}/${PROJECT_NAME_LOWER}/idl
- COMPONENT headers)
-
+set(idls ${CMAKE_CURRENT_SOURCE_DIR}/CalibrationService.idl ${CMAKE_CURRENT_SOURCE_DIR}/InterfaceDataTypes.idl ${CMAKE_CURRENT_SOURCE_DIR}/BasicDataType.idl ${CMAKE_CURRENT_SOURCE_DIR}/ExtendedDataTypes.idl )
+
+#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)
+
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/include/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/include/CMakeLists.txt 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/include/CMakeLists.txt 2014-03-14 08:18:42 UTC (rev 119)
@@ -1,4 +1,4 @@
-add_subdirectory(ImageCalibration)
-
-MAP_ADD_STR(hdrs "${PROJECT_NAME}/" headers)
-set(headers ${headers} PARENT_SCOPE)
+add_subdirectory(ImageCalibration)
+
+MAP_ADD_STR(hdrs "${PROJECT_NAME}/" headers)
+set(headers ${headers} PARENT_SCOPE)
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/include/ImageCalibration/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/include/ImageCalibration/CMakeLists.txt 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/include/ImageCalibration/CMakeLists.txt 2014-03-14 08:18:42 UTC (rev 119)
@@ -1,7 +1,8 @@
-set(hdrs ImageCalibration.h
- PARENT_SCOPE
- )
-
-install(FILES ${hdrs} DESTINATION ${INC_INSTALL_DIR}/${PROJECT_NAME_LOWER}
- COMPONENT library)
-
+set(hdrs ImageCalibration.h
+# PARENT_SCOPE
+ CalibrationServiceSVC_impl.h
+ )
+
+#install(FILES ${hdrs} DESTINATION ${INC_INSTALL_DIR}/${PROJECT_NAME_LOWER}
+# COMPONENT library)
+
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/include/ImageCalibration/ImageCalibration.h
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/include/ImageCalibration/ImageCalibration.h 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/include/ImageCalibration/ImageCalibration.h 2014-03-14 08:18:42 UTC (rev 119)
@@ -1,372 +1,308 @@
-// -*- C++ -*-
-/*!
- * @file ImageCalibration.h
- * @brief ImageCalibration component
- * @date $Date$
- *
- * $Id$
- */
-
-#ifndef IMAGECALIBRATION_H
-#define IMAGECALIBRATION_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 <highgui.h>
-#include <cxcore.h>
-
-#define NUM_OF_BACKGROUND_FRAMES 5 // chessboard‚𶬂·‚é‚Ì‚ÉŽg—p‚·‚é‰æ‘œ‚Ì–‡”
-//#define CORNER_WIDTH 11
-//#define CORNER_HEIGHT 8
-//#define CORNER_NUMBER (CORNER_WIDTH * CORNER_HEIGHT)
-#define UNIT 5
-
-// cvFindChessboardCorners‚̃tƒ‰ƒO—p’è”
-#define ADAPTIVE_THRESH 1 // CV_CALIB_CB_ADAPTIVE_THRESH‚ðÝ’è‚·‚é‚©‚Ç‚¤‚©
-#define NORMALIZE_IMAGE 1 // CV_CALIB_CB_NORMALIZE_IMAGE‚ðÝ’è‚·‚é‚©‚Ç‚¤‚©
-#define FILTER_QUADS 1 // CV_CALIB_CB_FILTER_QUADS‚ðÝ’è‚·‚é‚©‚Ç‚¤‚©
-
-// cvTermCriteria—p’è”
-#define MAX_ITERATIONS 20 // ”½•œ”‚ÌÅ‘å’l
-#define EPSILON 0.001 // –Ú•W¸“x
-
-// cvFindCornerSubPix—p’è”
-#define SEARCH_WINDOW_HALF_WIDTH 5 // ŒŸõƒEƒBƒ“ƒhƒE‚̉¡•‚Ì”¼•ª‚̃TƒCƒY
-#define SEARCH_WINDOW_HALF_HEIGHT 5 // ŒŸõƒEƒBƒ“ƒhƒE‚Ìc•‚Ì”¼•ª‚̃TƒCƒY
-#define DEAD_REGION_HALF_WIDTH -1 // ‘˜a‘ÎÛŠO—̈æ‚̉¡•‚Ì”¼•ª‚̃TƒCƒY
-#define DEAD_REGION_HALF_HEIGHT -1 // ‘˜a‘ÎÛŠO—̈æ‚Ìc•‚Ì”¼•ª‚̃TƒCƒY
-
-#define THRESHOLD_COEFFICIENT 5.0 // 臒l‚Ì’l‚ðˆø‚Û‚ÌŽg—p‚·‚é臒l‚É‚©‚¯‚é”
-
-#define CALIBRATE_CAMERA_FLAG 0
-
-// Service implementation headers
-// <rtc-template block="service_impl_h">
-
-// </rtc-template>
-
-// Service Consumer stub headers
-// <rtc-template block="consumer_stub_h">
-
-// </rtc-template>
-
-using namespace RTC;
-
-/*!
- * @class ImageCalibration
- * @brief ImageCalibration component
- *
- */
-class ImageCalibration
- : public RTC::DataFlowComponentBase
-{
- public:
- /*!
- * @brief constructor
- * @param manager Maneger Object
- */
- ImageCalibration(RTC::Manager* manager);
-
- /*!
- * @brief destructor
- */
- ~ImageCalibration();
-
- // <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);
- /*!
- *
- * - Name: board_w
- * - DefaultValue: 13
- */
- CvPoint2D32f* corners;
-
- protected:
- // <rtc-template block="protected_attribute">
-
- // </rtc-template>
-
- // <rtc-template block="protected_operation">
-
- // </rtc-template>
-
- // Configuration variable declaration
- // <rtc-template block="config_declare">
- /*!
- *
- * - Name: m_board_w
- * - DefaultValue: 11
- */
-// int m_board_w;
- /*!
- *
- * - Name: board_h
- * - DefaultValue: 8
- */
-// int m_board_h;
- /*!
- *
- * - Name: camera_Height
- * - DefaultValue: -20
- */
- float m_camera_Height;
-
- // </rtc-template>
-
- // DataInPort declaration
- // <rtc-template block="inport_declare">
- RTC::CameraImage m_inputImage;
- /*!
- */
- InPort<RTC::CameraImage> m_inputImageIn;
- RTC::TimedLong m_key;
- /*!
- */
- InPort<RTC::TimedLong> m_keyIn;
-
- // </rtc-template>
-
-
- // DataOutPort declaration
- // <rtc-template block="outport_declare">
- RTC::CameraImage m_origImage;
- /*!
- */
- OutPort<RTC::CameraImage> m_origImageOut;
- RTC::CameraImage m_birdImage;
- /*!
- */
- OutPort<RTC::CameraImage> m_birdImageOut;
- RTC::TimedString m_internalParameter;
- /*!
- */
- OutPort<RTC::TimedString> m_internalParameterOut;
- RTC::TimedString m_externalParameter;
- /*!
- */
- OutPort<RTC::TimedString> m_externalParameterOut;
- RTC::TimedString m_renseParameter;
- /*!
- */
- OutPort<RTC::TimedString> m_renseParameterOut;
-
- // </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>
-
- CvMat *intrinsicMatrix;
- CvMat *distortionCoefficient;
-
- IplImage* mapx;
- IplImage* mapy;
- IplImage* undistortionImage;
- IplImage* birds_image;
- IplImage* tempImage_buff;
- IplImage* inputImage_buff;
- IplImage* outputImage_buff;
-
- int key;
- int captureCount;
- int findFlag;
-
- int InParameter;
- int outParameter;
-
- int dummy;
-
-};
-
-
-extern "C"
-{
- DLL_EXPORT void ImageCalibrationInit(RTC::Manager* manager);
-};
-
-#endif // IMAGECALIBRATION_H
+// -*- C++ -*-
+/*!
+ * @file ImageCalibration.h
+ * @brief Image Calibration
+ * @date $Date$
+ *
+ * $Id$
+ */
+
+#ifndef IMAGECALIBRATION_H
+#define IMAGECALIBRATION_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>
+
+// Service implementation headers
+// <rtc-template block="service_impl_h">
+#include "CalibrationServiceSVC_impl.h"
+
+// </rtc-template>
+
+// Service Consumer stub headers
+// <rtc-template block="consumer_stub_h">
+
+// </rtc-template>
+
+using namespace RTC;
+
+/*!
+ * @class ImageCalibration
+ * @brief Image Calibration
+ *
+ */
+class ImageCalibration
+ : public RTC::DataFlowComponentBase
+{
+ public:
+ /*!
+ * @brief constructor
+ * @param manager Maneger Object
+ */
+ ImageCalibration(RTC::Manager* manager);
+
+ /*!
+ * @brief destructor
+ */
+ ~ImageCalibration();
+
+ // <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: checker_w
+ * - DefaultValue: 13
+ */
+ int m_checker_w;
+ /*!
+ *
+ * - Name: checker_h
+ * - DefaultValue: 9
+ */
+ int m_checker_h;
+ /*!
+ *
+ * - Name: image_num
+ * - DefaultValue: 5
+ */
+ int m_image_num;
+
+ // </rtc-template>
+
+ // DataInPort declaration
+ // <rtc-template block="inport_declare">
+ RTC::CameraImage m_img_orig;
+ /*!
+ */
+ InPort<RTC::CameraImage> m_img_origIn;
+
+ // </rtc-template>
+
+
+ // DataOutPort declaration
+ // <rtc-template block="outport_declare">
+ RTC::CameraImage m_img_check;
+ /*!
+ */
+ OutPort<RTC::CameraImage> m_img_checkOut;
+
+ // </rtc-template>
+
+ // CORBA Port declaration
+ // <rtc-template block="corbaport_declare">
+ /*!
+ */
+ RTC::CorbaPort m_CameraCalibrationServicePort;
+
+ // </rtc-template>
+
+ // Service declaration
+ // <rtc-template block="service_declare">
+ /*!
+ */
+ CalibrationServiceSVC_impl m_CalibrationService;
+
+ // </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>
+ void checkImageNum(void);
+
+ int m_current_image_num; /* ãƒã‚§ã‚¹ãƒœãƒ¼ãƒ‰æ’®å½±æžšæ•° */
+
+};
+
+
+extern "C"
+{
+ DLL_EXPORT void ImageCalibrationInit(RTC::Manager* manager);
+};
+
+#endif // IMAGECALIBRATION_H
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/rtc.conf
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/rtc.conf 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/rtc.conf 2014-03-14 08:18:42 UTC (rev 119)
@@ -1,437 +1,437 @@
-#------------------------------------------------------------
-# RT-Component manager configuration
-#
-# See details in the following reference manual or web page.
-# http://www.openrtm.org/openrtm/en/content/configuration
-# http://www.openrtm.org/openrtm/ja/content/rtcconf%E8%A8%AD%E5%AE%9A%E9%A0%85%E7%9B%AE%E4%B8%80%E8%A6%A7
-# http://www.openrtm.org/openrtm/ko/content/rtcconf-%EC%84%A4%EC%A0%95-%ED%95%AD%EB%AA%A9-%EC%9D%BC%EB%9E%8C
-#
-
-#------------------------------------------------------------
-# Typically used configuration parameters
-#
-# corba.name_servers: localhost, 192.168.0.1
-# corba.endpoints: <interface addess>, <interface addess>
-# logger.enable: YES
-# logger.file_name: ./rtc%p.log
-# logger.log_level: NORMAL
-#
-# The following properties should be specified in component specific
-# configuration files.
-# exec_cxt.periodic.type: PeriodicExecutionContext
-# exec_cxt.periodic.rate: 1000
-
-# Component specific configruation files:
-# If you want to load component specific configuration file, please
-# uncomment the following line.
-#
-# Category.ImageCalibration.config_file: ImageCalibration.conf
-# or
-# Category.ImageCalibration0.config_file: ImageCalibration0.conf
-# Category.ImageCalibration1.config_file: ImageCalibration1.conf
-# Category.ImageCalibration2.config_file: ImageCalibration2.conf
-#
-#------------------------------------------------------------
-
-Category.ImageCalibration.config_file: ImageCalibration.conf
-
-#
-# Please delete the following part if you are familiar with OpenRTM's
-# configuration parameters.
-#
-##----------------------------------------------------------------------
-##
-## RT-Component manager configurations
-##
-##----------------------------------------------------------------------
-
-##------------------------------------------------------------
-## Configuration version (optional)
-##
-# config.version: 1.0
-
-##------------------------------------------------------------
-## OpenRTM-aist version (optional)
-##
-# openrtm.version: 1.0.0
-
-##------------------------------------------------------------
-## The name of manager (default = manager)
-##
-# manager.name: manager
-
-##------------------------------------------------------------
-## Master manager
-## - manager.is_master: YES/NO, This process made a master or not.
-## - manager.corba_servant: YES/NO, create manager's corba service or not
-## - corba.master_manager: <host_name>:<port>, master manager's location
-# manager.is_master: YES
-# manager.corba_servant: YES
-# corba.master_manager: localhost:2810
-
-##------------------------------------------------------------
-## Manager auto shutdown options
-## - manager.shutdown_on_nortcs: YES/NO,
-## process will be shutdown in case no rtc exists when rtc is deleted.
-## - manager.shutdown_auto:
-## process will be shutdown in case no rtc exists on periodic check.
-# manager.shutdown_on_nortcs: YES
-# manager.shutdown_auto: YES
-# manager.auto_shutdown_duration: 10.0
-
-##============================================================
-## CORBA configuration
-##============================================================
-##
-## CORBA ORB's arguments
-##
-## ORB specific command line options given to ORB_init().
-## See your ORB documentation.
-##
-## Example:
-## corba.args: -ORBInitialHost myhost -ORBInitialPort 8888
-##
-##
-# corba.args:
-
-##
-## ORB endpoint
-##
-## If you have two or more network interfaces, ORB endpoint address and/or
-## port have to be specified. If hostname or port number is abbreviated,
-## default interface or port number is used. At least one colon ':'
-## is needed when you specify this option.
-##
-## Examples:
-## corba.endpoint: myhost: (use myhost and default port)
-## corba.endpoint: :9876 (use default addr and port 9876)
-## corba.endpoint: myhost:9876 (use myhost and port 9876)
-##
-# corba.endpoint:
-
-##
-## Multiple endpoint options (experimental)
-##
-## Multiple endpoint addresses and ports can be specified using this option.
-##
-## Example:
-## corba.endpoints: 192.168.1.10:1111, 192.168.10.11:2222
-## corba.endpoints: 192.168.1.10, 192.168.10.11
-## corba.endpoints: all
-##
-# corba.endpoints:
-
-
-##
-## CORBA name server setting
-##
-## Multiple name servers can be specified separating by comma.
-## If port number is abbreviated, default port number is used.
-## The default port number is depend on ORB implementation.
-##
-## Examples:
-## corba.nameservers: openrtm.aist.go.jp:9876
-## corba.nameservers: rtm0.aist.go.jp, rtm1.aist.go.jp, rtm2.aist.go.jp
-##
-# corba.nameservers: localhost
-
-##
-## IOR host address replacement by guessed endpoint from routing (experimental)
-##
-## This option replaces a host address with an endpoint that is guessed
-## by route information to nameserver's address. This option may be
-## effective for CORBA implementation that does not supports IOR's
-## multiple profile or alternate IIOP address. However, since other
-## object references that are obtained from RT-Components or other are
-## not modified by this rule, other RTCs that are connected to this RTC
-## have to also support IOR multiple profile feature. When this option
-## is used, corba.endpoints option should also be specified with
-## multiple endpoints.
-##
-# corba.nameservice.replace_endpoint: NO
-
-##
-## IOR alternate IIOP addresses
-##
-## This option adds alternate IIOP addresses into the IOR Profiles.
-## IOR can include additional endpoints for a servant. It is almost
-## same as "corba.endpoints" option, but this option does not create
-## actual endpoint on the ORB. (corba.endpoints try to create actual
-## endpoint, and if it cannot be created, error will be returned.)
-## This option just add alternate IIOP endpoint address information to
-## an IOR.
-##
-## This option can be used when RTCs are located inside of NAT or
-## router. Generally speaking, RTCs in a private network cannot
-## connect to RTCs in the global network, because global client cannot
-## reach to private servants. However, if route (or NAT) is properly
-## configured for port forwarding, global RTCs can reach to RTCs in
-## private network.
-##
-## A setting example is as follows.
-## 1) Configure your router properly for port-forwarding.
-## ex. global 2810 port is forwarded to private 2810
-## 2) Set the following options in rtc.conf
-## corba.nameservers: my.global.nameserver.com <- name server in global network
-## corba.endpoints: :2810 <- actual port number
-## corba.additional_ior_addresses: w.x.y.z:2810 <- routers global IP addr/port
-## 3) Launch global RTCs and private RTC, and connect them.
-##
-# corba.alternate_iiop_addresses: addr:port
-
-##============================================================
-## Naming configurations
-##============================================================
-##
-## Enable/Disable naming functions
-##
-# naming.enable: YES
-
-##
-## Naming Types
-##
-## Now only "corba" is supported.
-##
-# naming.type: corba
-
-##
-## Naming format
-##
-## The name format of components that is bound to naming services.
-## The delimiter between names is "/".
-## The delimiter between name and kind is ".".
-##
-## example: (OpenRTM-aist-0.2.0 style)
-## %h.host_cxt/%M.mgr_cxt/%c.cat_cxt/%m.mod_cxt/%n.rtc
-## This is formatted according to the following replacement rules.
-##
-## %n: The instance name of the component.
-## %t: The type name of the component.
-## %m: The module name of the component.
-## %v: The version of the component.
-## %V: The component vendor.
-## %c: The category of the component.
-## %h: The hostname.
-## %M: The manager name.
-## %p: PID of the manager.
-##
-# naming.formats: %h.host/%n.rtc
-
-##
-## Auto update to Naming Server
-##
-# naming.update.enable: YES
-##
-## Update interval [s] for auto update
-##
-# naming.update.interval: 10.0
-##
-## Rebind references in auto update
-##
-# naming.update.rebind: NO
-
-## End of Naming configuration section
-##------------------------------------------------------------
-
-##============================================================
-## Module management
-##============================================================
-##
-## Loadable module search path list
-##
-## Manager searches loadable modules from the specified search path list.
-## Path list elements should be separated by comma.
-## Path delimiter is '/' on UNIX, and '\\' on Windows
-## Valid path examples:
-## manager.modules.load_path: C:/Program Files/OpenRTM-aist, \
-## C:\\Program Files\\OpenRTM-aist
-## manager.modules.load_path: /usr/lib, /usr/local/lib, \
-## /usr/local/lib/OpenRTM-aist/libs
-##
-# manager.modules.load_path: ./
-
-##
-## Preload module list
-##
-## Manager can load loadable modules before starting up.
-## Loadable modules, which is specified only as its file name, is searched
-## in each module load path specified in the "manager.modules.load_path".
-## If the "manager.modules.abs_path_allowed" option is YES, loadable file
-## can be specified as full-path name,
-##
-## Valid settings:
-## manager.modules.preload: ConsoleIn.dll, ConsoleOut.dll
-## manager.modules.preload: ConsoleIn.so, ConsoleOut.so
-## manager.modules.abs_path_allowed: YES
-## manager.modules.preload: /usr/lib/OpenRTM-aist/ConsoleIn.so
-##
-# manager.modules.preload:
-
-##
-## Permission flag of absolute module path
-##
-## If this option is "YES", absolute path specification for module is allowed.
-##
-# manager.modules.abs_path_allowed: YES
-
-##
-## The following options are not implemented yet.
-##
-## manager.modules.config_ext:
-## manager.modules.config_path:
-## manager.modules.detect_loadable:
-## manager.modules.init_func_suffix:
-## manager.modules.init_func_prefix:
-## manager.modules.download_allowed:
-## manager.modules.download_dir:
-## manager.modules.download_cleanup:
-##
-
-##
-## Advance component creation
-##
-## This option specifies components' names (module name) creating in advance
-## before starting the manager's event-loop. The components' factories should
-## be registered by manager.module.preload option or statically linked to the
-## manager.
-##
-## Example:
-## manager.components.precreate: ConsoleIn, ConsoleOut, SeqIn, SeqOut
-##
-# manager.components.precreate:
-
-
-##============================================================
-## Logger configurations
-##============================================================
-##
-## Enable/Disable logger [YES/NO]
-# logger.enable: YES
-
-##
-## Log file name (default = ./rtc%p.log)
-##
-## %p: PID
-##
-# logger.file_name: ./rtc%p.log
-
-##
-## Log date format (default = %b %d %H:%M:%S)
-##
-## The following strftime(3) like format expression is available.
-## If no prefix is needed, use "No" or "Disable".
-##
-## %a abbreviated weekday name
-## %A full weekday name
-## %b abbreviated month name
-## %B full month name
-## %c the standard date and time string
-## %d day of the month, as a number (1-31)
-## %H hour, 24 hour format (0-23)
-## %I hour, 12 hour format (1-12)
-## %j day of the year, as a number (1-366)
-## %m month as a number (1-12).
-## Note: some versions of Microsoft Visual C++ may use values that range
-## from 0-11.
-## %M minute as a number (0-59)
-## %p locale's equivalent of AM or PM
-## %Q millisecond as a number (0-999) from ver 1.1
-## %q microsecond as a number (0-999) from ver 1.1
-## %S second as a number (0-59)
-## %U week of the year, sunday as the first day
-## %w weekday as a decimal (0-6, sunday=0)
-## %W week of the year, monday as the first day
-## %x standard date string
-## %X standard time string
-## %y year in decimal, without the century (0-99)
-## %Y year in decimal, with the century
-## %Z time zone name
-## %% a percent sign
-##
-##
-## logger.date_format: No
-## logger.date_format: Disable
-## logger.date_format: [%Y-%m-%dT%H.%M.%S%Z] // W3C standard format
-## logger.date_format: [%b %d %H:%M:%S] // Syslog format
-## logger.date_format: [%a %b %d %Y %H:%M:%S %Z] // RFC2822 format
-## logger.date_format: [%a %b %d %H:%M:%S %Z %Y] // data command format
-## logger.date_format: [%Y-%m-%d %H.%M.%S]
-##
-# logger.date_format: %b %d %H:%M:%S
-
-##
-## Log level (default = NORMAL)
-##
-## The following LogLevels are allowed.
-## SILENT, ERROR, WARN, NORMAL, INFO, DEBUG, TRACE, VERBOSE, PARANOID
-##
-##
-## SILENT : completely silent
-## ERROR : includes (ERROR)
-## WARN : includes (ERROR, WARN)
-## INFO : includes (ERROR, WARN, INFO)
-## NORMAL : includes (ERROR, WARN, INFO, NORMAL)
-## DEBUG : includes (ERROR, WARN, INFO, NORMAL, DEBUG)
-## TRACE : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE)
-## VERBOSE : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE)
-## PARANOID: includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE, PARA)
-##
-## Warning!!!
-## "TRACE", "VERBOSE", "PARANOID" logging level will create a huge log file!!
-## "PARANOID" log level will tangle the log file.
-##
-# logger.log_level: NORMAL
-
-##============================================================
-## Timer configuration
-##============================================================
-##
-## Enable/disable timer function
-##
-# timer.enable: YES
-
-##
-## Timer clock tick setting [s]
-##
-# timer.tick: 0.1
-
-##============================================================
-## 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
-
-##============================================================
-## SDO service settings
-##============================================================
-##
-## SDO service provider settings
-##
-# sdo.service.provider.available_services: [read only]
-# sdo.service.provider.enabled_services: ALL
-# sdo.service.provider.providing_services: [read only]
-##
-## SDO service consumer settings
-##
-# sdo.service.consumer.available_services: [read only]
-# sdo.service.consumer.enabled_services: ALL
+#------------------------------------------------------------
+# RT-Component manager configuration
+#
+# See details in the following reference manual or web page.
+# http://www.openrtm.org/openrtm/en/content/configuration
+# http://www.openrtm.org/openrtm/ja/content/rtcconf%E8%A8%AD%E5%AE%9A%E9%A0%85%E7%9B%AE%E4%B8%80%E8%A6%A7
+# http://www.openrtm.org/openrtm/ko/content/rtcconf-%EC%84%A4%EC%A0%95-%ED%95%AD%EB%AA%A9-%EC%9D%BC%EB%9E%8C
+#
+
+#------------------------------------------------------------
+# Typically used configuration parameters
+#
+# corba.name_servers: localhost, 192.168.0.1
+# corba.endpoints: <interface addess>, <interface addess>
+# logger.enable: YES
+# logger.file_name: ./rtc%p.log
+# logger.log_level: NORMAL
+#
+# The following properties should be specified in component specific
+# configuration files.
+# exec_cxt.periodic.type: PeriodicExecutionContext
+# exec_cxt.periodic.rate: 1000
+
+# Component specific configruation files:
+# If you want to load component specific configuration file, please
+# uncomment the following line.
+#
+# Category.ImageCalibration.config_file: ImageCalibration.conf
+# or
+# Category.ImageCalibration0.config_file: ImageCalibration0.conf
+# Category.ImageCalibration1.config_file: ImageCalibration1.conf
+# Category.ImageCalibration2.config_file: ImageCalibration2.conf
+#
+#------------------------------------------------------------
+
+Category.ImageCalibration.config_file: ImageCalibration.conf
+
+#
+# Please delete the following part if you are familiar with OpenRTM's
+# configuration parameters.
+#
+##----------------------------------------------------------------------
+##
+## RT-Component manager configurations
+##
+##----------------------------------------------------------------------
+
+##------------------------------------------------------------
+## Configuration version (optional)
+##
+# config.version: 1.0
+
+##------------------------------------------------------------
+## OpenRTM-aist version (optional)
+##
+# openrtm.version: 1.0.0
+
+##------------------------------------------------------------
+## The name of manager (default = manager)
+##
+# manager.name: manager
+
+##------------------------------------------------------------
+## Master manager
+## - manager.is_master: YES/NO, This process made a master or not.
+## - manager.corba_servant: YES/NO, create manager's corba service or not
+## - corba.master_manager: <host_name>:<port>, master manager's location
+# manager.is_master: YES
+# manager.corba_servant: YES
+# corba.master_manager: localhost:2810
+
+##------------------------------------------------------------
+## Manager auto shutdown options
+## - manager.shutdown_on_nortcs: YES/NO,
+## process will be shutdown in case no rtc exists when rtc is deleted.
+## - manager.shutdown_auto:
+## process will be shutdown in case no rtc exists on periodic check.
+# manager.shutdown_on_nortcs: YES
+# manager.shutdown_auto: YES
+# manager.auto_shutdown_duration: 10.0
+
+##============================================================
+## CORBA configuration
+##============================================================
+##
+## CORBA ORB's arguments
+##
+## ORB specific command line options given to ORB_init().
+## See your ORB documentation.
+##
+## Example:
+## corba.args: -ORBInitialHost myhost -ORBInitialPort 8888
+##
+##
+# corba.args:
+
+##
+## ORB endpoint
+##
+## If you have two or more network interfaces, ORB endpoint address and/or
+## port have to be specified. If hostname or port number is abbreviated,
+## default interface or port number is used. At least one colon ':'
+## is needed when you specify this option.
+##
+## Examples:
+## corba.endpoint: myhost: (use myhost and default port)
+## corba.endpoint: :9876 (use default addr and port 9876)
+## corba.endpoint: myhost:9876 (use myhost and port 9876)
+##
+# corba.endpoint:
+
+##
+## Multiple endpoint options (experimental)
+##
+## Multiple endpoint addresses and ports can be specified using this option.
+##
+## Example:
+## corba.endpoints: 192.168.1.10:1111, 192.168.10.11:2222
+## corba.endpoints: 192.168.1.10, 192.168.10.11
+## corba.endpoints: all
+##
+# corba.endpoints:
+
+
+##
+## CORBA name server setting
+##
+## Multiple name servers can be specified separating by comma.
+## If port number is abbreviated, default port number is used.
+## The default port number is depend on ORB implementation.
+##
+## Examples:
+## corba.nameservers: openrtm.aist.go.jp:9876
+## corba.nameservers: rtm0.aist.go.jp, rtm1.aist.go.jp, rtm2.aist.go.jp
+##
+# corba.nameservers: localhost
+
+##
+## IOR host address replacement by guessed endpoint from routing (experimental)
+##
+## This option replaces a host address with an endpoint that is guessed
+## by route information to nameserver's address. This option may be
+## effective for CORBA implementation that does not supports IOR's
+## multiple profile or alternate IIOP address. However, since other
+## object references that are obtained from RT-Components or other are
+## not modified by this rule, other RTCs that are connected to this RTC
+## have to also support IOR multiple profile feature. When this option
+## is used, corba.endpoints option should also be specified with
+## multiple endpoints.
+##
+# corba.nameservice.replace_endpoint: NO
+
+##
+## IOR alternate IIOP addresses
+##
+## This option adds alternate IIOP addresses into the IOR Profiles.
+## IOR can include additional endpoints for a servant. It is almost
+## same as "corba.endpoints" option, but this option does not create
+## actual endpoint on the ORB. (corba.endpoints try to create actual
+## endpoint, and if it cannot be created, error will be returned.)
+## This option just add alternate IIOP endpoint address information to
+## an IOR.
+##
+## This option can be used when RTCs are located inside of NAT or
+## router. Generally speaking, RTCs in a private network cannot
+## connect to RTCs in the global network, because global client cannot
+## reach to private servants. However, if route (or NAT) is properly
+## configured for port forwarding, global RTCs can reach to RTCs in
+## private network.
+##
+## A setting example is as follows.
+## 1) Configure your router properly for port-forwarding.
+## ex. global 2810 port is forwarded to private 2810
+## 2) Set the following options in rtc.conf
+## corba.nameservers: my.global.nameserver.com <- name server in global network
+## corba.endpoints: :2810 <- actual port number
+## corba.additional_ior_addresses: w.x.y.z:2810 <- routers global IP addr/port
+## 3) Launch global RTCs and private RTC, and connect them.
+##
+# corba.alternate_iiop_addresses: addr:port
+
+##============================================================
+## Naming configurations
+##============================================================
+##
+## Enable/Disable naming functions
+##
+# naming.enable: YES
+
+##
+## Naming Types
+##
+## Now only "corba" is supported.
+##
+# naming.type: corba
+
+##
+## Naming format
+##
+## The name format of components that is bound to naming services.
+## The delimiter between names is "/".
+## The delimiter between name and kind is ".".
+##
+## example: (OpenRTM-aist-0.2.0 style)
+## %h.host_cxt/%M.mgr_cxt/%c.cat_cxt/%m.mod_cxt/%n.rtc
+## This is formatted according to the following replacement rules.
+##
+## %n: The instance name of the component.
+## %t: The type name of the component.
+## %m: The module name of the component.
+## %v: The version of the component.
+## %V: The component vendor.
+## %c: The category of the component.
+## %h: The hostname.
+## %M: The manager name.
+## %p: PID of the manager.
+##
+# naming.formats: %h.host/%n.rtc
+
+##
+## Auto update to Naming Server
+##
+# naming.update.enable: YES
+##
+## Update interval [s] for auto update
+##
+# naming.update.interval: 10.0
+##
+## Rebind references in auto update
+##
+# naming.update.rebind: NO
+
+## End of Naming configuration section
+##------------------------------------------------------------
+
+##============================================================
+## Module management
+##============================================================
+##
+## Loadable module search path list
+##
+## Manager searches loadable modules from the specified search path list.
+## Path list elements should be separated by comma.
+## Path delimiter is '/' on UNIX, and '\\' on Windows
+## Valid path examples:
+## manager.modules.load_path: C:/Program Files/OpenRTM-aist, \
+## C:\\Program Files\\OpenRTM-aist
+## manager.modules.load_path: /usr/lib, /usr/local/lib, \
+## /usr/local/lib/OpenRTM-aist/libs
+##
+# manager.modules.load_path: ./
+
+##
+## Preload module list
+##
+## Manager can load loadable modules before starting up.
+## Loadable modules, which is specified only as its file name, is searched
+## in each module load path specified in the "manager.modules.load_path".
+## If the "manager.modules.abs_path_allowed" option is YES, loadable file
+## can be specified as full-path name,
+##
+## Valid settings:
+## manager.modules.preload: ConsoleIn.dll, ConsoleOut.dll
+## manager.modules.preload: ConsoleIn.so, ConsoleOut.so
+## manager.modules.abs_path_allowed: YES
+## manager.modules.preload: /usr/lib/OpenRTM-aist/ConsoleIn.so
+##
+# manager.modules.preload:
+
+##
+## Permission flag of absolute module path
+##
+## If this option is "YES", absolute path specification for module is allowed.
+##
+# manager.modules.abs_path_allowed: YES
+
+##
+## The following options are not implemented yet.
+##
+## manager.modules.config_ext:
+## manager.modules.config_path:
+## manager.modules.detect_loadable:
+## manager.modules.init_func_suffix:
+## manager.modules.init_func_prefix:
+## manager.modules.download_allowed:
+## manager.modules.download_dir:
+## manager.modules.download_cleanup:
+##
+
+##
+## Advance component creation
+##
+## This option specifies components' names (module name) creating in advance
+## before starting the manager's event-loop. The components' factories should
+## be registered by manager.module.preload option or statically linked to the
+## manager.
+##
+## Example:
+## manager.components.precreate: ConsoleIn, ConsoleOut, SeqIn, SeqOut
+##
+# manager.components.precreate:
+
+
+##============================================================
+## Logger configurations
+##============================================================
+##
+## Enable/Disable logger [YES/NO]
+# logger.enable: YES
+
+##
+## Log file name (default = ./rtc%p.log)
+##
+## %p: PID
+##
+# logger.file_name: ./rtc%p.log
+
+##
+## Log date format (default = %b %d %H:%M:%S)
+##
+## The following strftime(3) like format expression is available.
+## If no prefix is needed, use "No" or "Disable".
+##
+## %a abbreviated weekday name
+## %A full weekday name
+## %b abbreviated month name
+## %B full month name
+## %c the standard date and time string
+## %d day of the month, as a number (1-31)
+## %H hour, 24 hour format (0-23)
+## %I hour, 12 hour format (1-12)
+## %j day of the year, as a number (1-366)
+## %m month as a number (1-12).
+## Note: some versions of Microsoft Visual C++ may use values that range
+## from 0-11.
+## %M minute as a number (0-59)
+## %p locale's equivalent of AM or PM
+## %Q millisecond as a number (0-999) from ver 1.1
+## %q microsecond as a number (0-999) from ver 1.1
+## %S second as a number (0-59)
+## %U week of the year, sunday as the first day
+## %w weekday as a decimal (0-6, sunday=0)
+## %W week of the year, monday as the first day
+## %x standard date string
+## %X standard time string
+## %y year in decimal, without the century (0-99)
+## %Y year in decimal, with the century
+## %Z time zone name
+## %% a percent sign
+##
+##
+## logger.date_format: No
+## logger.date_format: Disable
+## logger.date_format: [%Y-%m-%dT%H.%M.%S%Z] // W3C standard format
+## logger.date_format: [%b %d %H:%M:%S] // Syslog format
+## logger.date_format: [%a %b %d %Y %H:%M:%S %Z] // RFC2822 format
+## logger.date_format: [%a %b %d %H:%M:%S %Z %Y] // data command format
+## logger.date_format: [%Y-%m-%d %H.%M.%S]
+##
+# logger.date_format: %b %d %H:%M:%S
+
+##
+## Log level (default = NORMAL)
+##
+## The following LogLevels are allowed.
+## SILENT, ERROR, WARN, NORMAL, INFO, DEBUG, TRACE, VERBOSE, PARANOID
+##
+##
+## SILENT : completely silent
+## ERROR : includes (ERROR)
+## WARN : includes (ERROR, WARN)
+## INFO : includes (ERROR, WARN, INFO)
+## NORMAL : includes (ERROR, WARN, INFO, NORMAL)
+## DEBUG : includes (ERROR, WARN, INFO, NORMAL, DEBUG)
+## TRACE : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE)
+## VERBOSE : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE)
+## PARANOID: includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE, PARA)
+##
+## Warning!!!
+## "TRACE", "VERBOSE", "PARANOID" logging level will create a huge log file!!
+## "PARANOID" log level will tangle the log file.
+##
+# logger.log_level: NORMAL
+
+##============================================================
+## Timer configuration
+##============================================================
+##
+## Enable/disable timer function
+##
+# timer.enable: YES
+
+##
+## Timer clock tick setting [s]
+##
+# timer.tick: 0.1
+
+##============================================================
+## 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
+
+##============================================================
+## SDO service settings
+##============================================================
+##
+## SDO service provider settings
+##
+# sdo.service.provider.available_services: [read only]
+# sdo.service.provider.enabled_services: ALL
+# sdo.service.provider.providing_services: [read only]
+##
+## SDO service consumer settings
+##
+# sdo.service.consumer.available_services: [read only]
+# sdo.service.consumer.enabled_services: ALL
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/src/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/src/CMakeLists.txt 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/src/CMakeLists.txt 2014-03-14 08:18:42 UTC (rev 119)
@@ -1,84 +1,90 @@
-set(comp_srcs ImageCalibration.cpp )
-set(standalone_srcs ImageCalibrationComp.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)
-target_link_libraries(${PROJECT_NAME} ${OPENRTM_LIBRARIES} ${OpenCV_LIBS})
-
-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)
-
-if (SolutionDir)
- if (MSVC)
- add_custom_command(
- TARGET ${PROJECT_NAME}
- POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E
- copy ${PROJECT_BINARY_DIR}/src/Release/${PROJECT_NAME}.dll ${SolutionDir}/bin
- )
- add_custom_command(
- TARGET ${PROJECT_NAME}Comp
- POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E
- copy ${PROJECT_BINARY_DIR}/src/Release/${PROJECT_NAME}Comp.exe ${SolutionDir}/bin
- )
-
- else (MSVC)
- add_custom_command(
- TARGET ${PROJECT_NAME}Comp
- POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E
- copy ${PROJECT_BINARY_DIR}/src/${PROJECT_NAME}Comp ${SolutionDir}/bin
- )
- endif (MSVC)
-endif (SolutionDir)
+set(comp_srcs ImageCalibration.cpp CalibrationServiceSVC_impl.cpp )
+set(standalone_srcs ImageCalibrationComp.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)
+target_link_libraries(${PROJECT_NAME} ${OPENRTM_LIBRARIES} ${OpenCV_LIBS})
+
+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)
+
+
+if (SolutionDir)
+ if (MSVC)
+ add_custom_command(
+ TARGET ${PROJECT_NAME}
+ POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E
+ copy ${PROJECT_BINARY_DIR}/src/Release/${PROJECT_NAME}.dll ${SolutionDir}/bin
+ )
+ add_custom_command(
+ TARGET ${PROJECT_NAME}Comp
+ POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E
+ copy ${PROJECT_BINARY_DIR}/src/Release/${PROJECT_NAME}Comp.exe ${SolutionDir}/bin
+ )
+
+ else (MSVC)
+ add_custom_command(
+ TARGET ${PROJECT_NAME}Comp
+ POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E
+ copy ${PROJECT_BINARY_DIR}/src/${PROJECT_NAME}Comp ${SolutionDir}/bin
+ )
+ endif (MSVC)
+endif (SolutionDir)
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/src/ImageCalibration.cpp
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/src/ImageCalibration.cpp 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/src/ImageCalibration.cpp 2014-03-14 08:18:42 UTC (rev 119)
@@ -1,722 +1,252 @@
-// -*- C++ -*-
-/*!
- * @file ImageCalibration.cpp
- * @brief ImageCalibration component
- * @date $Date$
- *
- * $Id$
- */
-
-#include "ImageCalibration.h"
-
-// Module specification
-// <rtc-template block="module_spec">
-static const char* imagecalibration_spec[] =
- {
- "implementation_id", "ImageCalibration",
- "type_name", "ImageCalibration",
- "description", "ImageCalibration 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.board_w", "11",
- "conf.default.board_h", "8",
- "conf.default.camera_Height", "-20",
- // Widget
- "conf.__widget__.board_w", "text",
- "conf.__widget__.board_h", "text",
- "conf.__widget__.camera_Height", "text",
- // Constraints
- ""
- };
-// </rtc-template>
-
-//IplImage *inputImage_buff;
-//IplImage *outputImage_buff;
-//IplImage *tempImage_buff;
-
-int m_board_w;
-int m_board_h;
-int g_temp_w = 0;
-int g_temp_h = 0;
-
-//CvPoint2D32f* corners = new CvPoint2D32f[11 * 8];
-CvPoint2D32f objPts[4], imgPts[4];
-
-CvSize board_sz;
-
-char* renseParameters = new char[200];
-char* internalParameter = new char[200];
-char* externalParameter = new char[200];
-
-
-/*!
- * @brief constructor
- * @param manager Maneger Object
- */
-ImageCalibration::ImageCalibration(RTC::Manager* manager)
- // <rtc-template block="initializer">
- : RTC::DataFlowComponentBase(manager),
- m_inputImageIn("inputImage", m_inputImage),
- m_keyIn("key", m_key),
- m_origImageOut("orignalImage", m_origImage),
- m_birdImageOut("birdImage", m_birdImage),
- m_internalParameterOut("internalParameter", m_internalParameter),
- m_externalParameterOut("externalParameter", m_externalParameter),
- m_renseParameterOut("renseParameter", m_renseParameter),
-
- // </rtc-template>
- dummy(0)
-{
-}
-
-/*!
- * @brief destructor
- */
-ImageCalibration::~ImageCalibration()
-{
-}
-
-void saveRenseMatrix(CvMat *matrixRense){
- sprintf(renseParameters, "%lf\n%lf\n%lf\n%lf\n",
- cvmGet(matrixRense,0,0),
- cvmGet(matrixRense,1,0),
- cvmGet(matrixRense,2,0),
- cvmGet(matrixRense,3,0)
- );
-
-}
-
-void saveInternalParameterMatrix(CvMat *matrix){
- sprintf(internalParameter,
- "%lf %lf %lf\n%lf %lf %lf\n%lf %lf %lf\n",
- cvmGet(matrix,0,0),
- cvmGet(matrix,0,1),
- cvmGet(matrix,0,2),
- cvmGet(matrix,1,0),
- cvmGet(matrix,1,1),
- cvmGet(matrix,1,2),
- cvmGet(matrix,2,0),
- cvmGet(matrix,2,1),
- cvmGet(matrix,2,2)
-
- );
-}
-
-void saveExternalParameterMatrix(CvMat *Matrix, CvMat *Vector){
- sprintf(externalParameter,
- "%lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf\n",
- cvmGet( Matrix, 0, 0),
- cvmGet( Matrix, 0, 1),
- cvmGet( Matrix, 0, 2),
- cvmGet( Vector, 0, 0),
- cvmGet( Matrix, 1, 0 ),
- cvmGet( Matrix, 1, 1 ),
- cvmGet( Matrix, 1, 2 ),
- cvmGet( Vector, 0, 1 ),
- cvmGet( Matrix, 2, 0 ),
- cvmGet( Matrix, 2, 1 ),
- cvmGet( Matrix, 2, 2 ),
- cvmGet( Vector, 0, 2 )
- );
-}
-
-//
-// s—ñ‚ð‰æ–Ê‚É•\Ž¦‚·‚é
-//
-// ˆø”:
-// disp : •\Ž¦‚·‚é”’l‚Ì‘Ž®
-// matrix : •\Ž¦‚·‚és—ñ
-//
-void printMatrix( char *disp, CvMat *matrix ) {
- for ( int y=0; y < matrix->height; y++ ) {
- for ( int x=0; x < matrix->width; x++ ) {
- printf( disp, cvmGet( matrix, y, x ) );
- }
- printf( "\n" );
- }
- printf( "\n" );
-
-}
-//
-// ŠO•”ƒpƒ‰ƒ[ƒ^s—ñ‚ð‰æ–Ê‚É•\Ž¦‚·‚é
-//
-// ˆø”:
-// rotationMatrix : ‰ñ“]s—ñ
-// translationVector :@•ÀiƒxƒNƒgƒ‹
-//
-void printExtrinsicMatrix( CvMat *rotationMatrix, CvMat *translationVector ) {
- for ( int i = 0; i<3; i++ ) {
- printf(
- "%lf %lf %lf %lf\n",
- cvmGet( rotationMatrix, i, 0 ),
- cvmGet( rotationMatrix, i, 1 ),
- cvmGet( rotationMatrix, i, 2 ),
- cvmGet( translationVector, 0, i )
- );
-
- }
-
-
-}
-
-//
-// cvFindChessboardCorners—p‚̃tƒ‰ƒO‚𶬂·‚é
-//
-int createFindChessboardCornersFlag() {
- int flag = 0;
-
- if ( ADAPTIVE_THRESH != 0 ) {
- flag = flag | CV_CALIB_CB_ADAPTIVE_THRESH;
- }
- if ( NORMALIZE_IMAGE != 0 ) {
- flag = flag | CV_CALIB_CB_NORMALIZE_IMAGE;
- }
- if ( FILTER_QUADS != 0 ) {
- flag = flag | CV_CALIB_CB_FILTER_QUADS;
- }
-
- return flag;
-}
-
-//
-// ƒR[ƒi[‚ðŒŸo‚·‚é
-//
-// ˆø”:
-// frameImage : ƒLƒƒƒvƒ`ƒƒ‰æ‘œ—pIplImage
-// grayImage : ƒOƒŒ[ƒXƒP[ƒ‹‰æ‘œ—pIplImage
-// corners : ƒR[ƒi[‚̈ʒu‚ðŠi”[‚·‚é•Ï”
-//
-// –ß‚è’l:
-// 0 : ƒR[ƒi[‚ª‚·‚ׂČŸo‚Å‚«‚È‚©‚Á‚½ê‡
-// ”ñ0 : ƒR[ƒi[‚ª‚·‚ׂČŸo‚³‚ꂽê‡
-//
-int findCorners( IplImage *frameImage, IplImage *grayImage, CvPoint2D32f *corners ) {
- int cornerCount; // ŒŸo‚µ‚½ƒR[ƒi[‚Ì”
- int findChessboardCornersFlag; // cvFindChessboardCorners—pƒtƒ‰ƒO
- int findFlag; // ƒR[ƒi[‚ª‚·‚ׂČŸo‚Å‚«‚½‚©‚̃tƒ‰ƒO
-
- IplImage* m_image_binary;
- IplImage* m_set_image;
-
- m_image_binary = cvCreateImage(cvSize(frameImage->width, frameImage->height), IPL_DEPTH_8U, 1);
- m_set_image = cvCreateImage(cvSize(frameImage->width, frameImage->height), IPL_DEPTH_8U, 3);
-
- // cvChessboardCorners—pƒtƒ‰ƒO‚𶬂·‚é
- findChessboardCornersFlag = createFindChessboardCornersFlag();
-
- //@‰æ‘œ‚ðBinaryImage‚Æ‚µ‚Ä•ÏŠ·‚·‚éB
- // ƒR[ƒi[‚ðŒŸo‚·‚é
- cvCvtColor( frameImage, grayImage, CV_BGR2GRAY );
-
- // ƒOƒŒ[ƒXƒP[ƒ‹‚©‚ç2’l‚É•ÏŠ·‚·‚é
- cvThreshold( grayImage, m_image_binary, 128, 255, CV_THRESH_BINARY );
-
- // Convert to 3channel image
- cvMerge(m_image_binary, m_image_binary, m_image_binary, NULL, m_set_image);
-
- findFlag=cvFindChessboardCorners(
- m_set_image,
- //m_set_image,
- //cvSize( CORNER_WIDTH, CORNER_HEIGHT ),
- board_sz,
- corners,
- &cornerCount,
- findChessboardCornersFlag
- );
-
- if( findFlag != 0 ) {
- // ƒR[ƒi[‚ª‚·‚ׂČŸo‚³‚ꂽê‡
- // ŒŸo‚³‚ꂽƒR[ƒi[‚̈ʒu‚ðƒTƒuƒsƒNƒZƒ‹’PˆÊ‚É‚·‚é
-
- CvTermCriteria criteria={ CV_TERMCRIT_ITER | CV_TERMCRIT_EPS, MAX_ITERATIONS, EPSILON };
- cvFindCornerSubPix(
- grayImage,
- corners,
- cornerCount,
- cvSize( SEARCH_WINDOW_HALF_WIDTH, SEARCH_WINDOW_HALF_HEIGHT ),
- cvSize( DEAD_REGION_HALF_WIDTH, DEAD_REGION_HALF_HEIGHT ),
- cvTermCriteria( CV_TERMCRIT_ITER | CV_TERMCRIT_EPS, MAX_ITERATIONS, EPSILON )
- );
- }
-
- // ƒR[ƒi[‚̈ʒu‚ð•`‚
- cvDrawChessboardCorners( frameImage, board_sz, corners, cornerCount, findFlag );
-
- cvReleaseImage(&m_set_image);
- cvReleaseImage(&m_image_binary);
-
- return findFlag;
-}
-
-RTC::ReturnCode_t ImageCalibration::onInitialize()
-{
- // Registration: InPort/OutPort/Service
- // <rtc-template block="registration">
- // Set InPort buffers
- addInPort("inputImage", m_inputImageIn);
- addInPort("key", m_keyIn);
-
- // Set OutPort buffer
- addOutPort("orignalImage", m_origImageOut);
- addOutPort("birdImage", m_birdImageOut);
- addOutPort("internalParameter", m_internalParameterOut);
- addOutPort("externalParameter", m_externalParameterOut);
- addOutPort("renseParameter", m_renseParameterOut);
-
- // 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("board_w", m_board_w, "11");
- bindParameter("board_h", m_board_h, "8");
- bindParameter("camera_Height", m_camera_Height, "-20");
- // </rtc-template>
-
- return RTC::RTC_OK;
-}
-
-/*
-RTC::ReturnCode_t ImageCalibration::onFinalize()
-{
- return RTC::RTC_OK;
-}
-*/
-
-/*
-RTC::ReturnCode_t ImageCalibration::onStartup(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-/*
-RTC::ReturnCode_t ImageCalibration::onShutdown(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-
-RTC::ReturnCode_t ImageCalibration::onActivated(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-
-
-RTC::ReturnCode_t ImageCalibration::onDeactivated(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-
-
-RTC::ReturnCode_t ImageCalibration::onExecute(RTC::UniqueId ec_id)
-{
-
- board_sz = cvSize(m_board_w, m_board_h);
-
- //Calibrationƒpƒ^[ƒ“‚ðŒvŽZ‚·‚éB
- if (m_inputImageIn.isNew()) {
-
- m_inputImageIn.read();
-
- if(m_keyIn.isNew()){
- m_keyIn.read();
- key = (int)m_key.data;
- }
-
- if(g_temp_w != m_inputImage.width || g_temp_h != m_inputImage.height){
-
- inputImage_buff = cvCreateImage(cvSize(m_inputImage.width, m_inputImage.height), 8, 3);
- outputImage_buff = cvCreateImage(cvSize(m_inputImage.width, m_inputImage.height), 8, 3);
- tempImage_buff = cvCreateImage(cvSize(m_inputImage.width, m_inputImage.height), 8, 3);
- undistortionImage = cvCreateImage(cvSize(m_inputImage.width, m_inputImage.height), 8, 3);
- birds_image = cvCreateImage(cvSize(m_inputImage.width, m_inputImage.height), 8, 3);
-
- intrinsicMatrix = cvCreateMat(3,3,CV_64FC1);
- distortionCoefficient = cvCreateMat(4,1,CV_64FC1);
-
- captureCount = 0;
- findFlag = 0;
-
- mapx = cvCreateImage( cvSize(m_inputImage.width, m_inputImage.height), IPL_DEPTH_32F, 1);
- mapy = cvCreateImage( cvSize(m_inputImage.width, m_inputImage.height), IPL_DEPTH_32F, 1);
-
- corners = new CvPoint2D32f[m_board_w * m_board_h];
-
- g_temp_w = m_inputImage.width;
- g_temp_h = m_inputImage.height;
-
- }
-
- //CaptureŠJŽn‚·‚éB
- memcpy(inputImage_buff->imageData,(void *)&(m_inputImage.pixels[0]), m_inputImage.pixels.length());
-
-// tempImage_buff = cvCloneImage(inputImage_buff);
- //OutPort‚Éo—Í‚·‚éB
- int len = inputImage_buff->nChannels * inputImage_buff->width * inputImage_buff->height;
- m_origImage.pixels.length(len);
-
- memcpy((void *)&(m_origImage.pixels[0]), inputImage_buff->imageData, len);
- m_origImage.width = inputImage_buff->width;
- m_origImage.height = inputImage_buff->height;
-
- m_origImageOut.write();
-
- //CaptureŠm”F—p‚ÌWindow‚̶¬
- //cvShowImage("Capture", inputImage_buff);
- cvWaitKey(1);
-
- //SpaceBar‚ð‰Ÿ‚·‚ƃTƒ“ƒvƒ‹‰f‘œ5–‡‚ðŽB‚é
- if (key == ' ') {
-
- tempImage_buff = cvCloneImage(inputImage_buff);
- //‰f‘œ‚𶬂·‚é
- IplImage *grayImage = cvCreateImage(cvGetSize(tempImage_buff), 8, 1);
-
- //s—ñ‚̶¬
- CvMat *worldCoordinates = cvCreateMat((m_board_w * m_board_h) * NUM_OF_BACKGROUND_FRAMES, 3, CV_64FC1); //¢ŠEÀ•W—ps—ñ
- CvMat *imageCoordinates = cvCreateMat((m_board_w * m_board_h) * NUM_OF_BACKGROUND_FRAMES ,2, CV_64FC1); //‰æ‘œÀ•W—ps—ñ
- CvMat *pointCounts = cvCreateMat(NUM_OF_BACKGROUND_FRAMES, 1, CV_32SC1); //ƒR[ƒi[”‚Ìs—ñ
- CvMat *rotationVectors = cvCreateMat(NUM_OF_BACKGROUND_FRAMES, 3, CV_64FC1); //‰ñ“]ƒxƒNƒgƒ‹
- CvMat *translationVectors = cvCreateMat(NUM_OF_BACKGROUND_FRAMES, 3, CV_64FC1);
-
- //¢ŠEÀ•W‚ðÝ’è‚·‚é
- for (int i = 0; i < NUM_OF_BACKGROUND_FRAMES; i++){
- for ( int j = 0; j < (m_board_w * m_board_h); j++) {
- cvSetReal2D(worldCoordinates, i * (m_board_w * m_board_h) + j, 0, (j % m_board_w) * UNIT);
- cvSetReal2D(worldCoordinates, i * (m_board_w * m_board_h) + j, 1, (j / m_board_w) * UNIT);
- cvSetReal2D(worldCoordinates, i * (m_board_w * m_board_h) + j, 2, 0.0);
- }
- }
-
- //ƒR[ƒi[”‚ðÝ’è
- for(int i = 0; i < NUM_OF_BACKGROUND_FRAMES; i++){
- cvSetReal2D(pointCounts, i, 0, (m_board_w * m_board_h));
- }
-
- //ƒR[ƒi[‚ðŒŸo‚·‚éB
- findFlag = findCorners(tempImage_buff, grayImage, corners);
-
- if (findFlag != 0) {
-
- //ƒR[ƒi[‚ð‚·‚×‚ÄŒŸo‚µ‚½ê‡
- //‰f‘œÀ•W‚ðÝ’è‚·‚éB
- for (;;){
- for (int i = 0; i < (m_board_w * m_board_h); i++){
- cvSetReal2D(imageCoordinates, captureCount * (m_board_w * m_board_h) + i, 0, corners[i].x);
- cvSetReal2D(imageCoordinates, captureCount * (m_board_w * m_board_h) + i, 1, corners[i].y);
- }
-
- captureCount++;
-
- printf("%d–‡–ÚƒLƒƒƒvƒ`ƒƒ‚µ‚Ü‚µ‚½\n", captureCount);
-
- if (captureCount == NUM_OF_BACKGROUND_FRAMES) {
- //ݒ肵‚½‰ñ”ƒ`ƒFƒbƒNƒpƒ^[ƒ“‚ðŽB‚Á‚½ê‡
- //ƒJƒƒ‰ƒpƒ‰ƒ[ƒ^‚ð„’è‚·‚éB
- cvCalibrateCamera2(
- worldCoordinates,
- imageCoordinates,
- pointCounts,
- cvGetSize(inputImage_buff),
- intrinsicMatrix,
- distortionCoefficient,
- rotationVectors,
- translationVectors,
- CALIBRATE_CAMERA_FLAG
- );
-
- //î•ñ‚ðText‚Æ‚µ‚Äo—Í
- printf("\nƒŒƒ“ƒY˜c‚ÝŒW”\n");
- saveRenseMatrix(distortionCoefficient);
- printMatrix("%lf", distortionCoefficient);
-
- //m_renseParameter.data = renseParameters;
-
- printf("\n“à•”ƒpƒ‰ƒ[ƒ^\n");
- saveInternalParameterMatrix(intrinsicMatrix);
- printMatrix("%lf ", intrinsicMatrix);
-
- //m_internalParameter.data = internalParameter;
-
- captureCount = 0;
- break;
-
- }
- }
- }
-
- if (findFlag != 0){
- InParameter = 1;
- }else if (findFlag == 0) {
- InParameter = 0;
- }
-
- //ƒƒ‚ƒŠ‰ðœ
- cvReleaseMat(&worldCoordinates);
- cvReleaseMat(&imageCoordinates);
- cvReleaseMat(&pointCounts);
- cvReleaseMat(&rotationVectors);
- cvReleaseMat(&translationVectors);
- cvReleaseImage(&grayImage);
-
- }
- g_temp_w = m_inputImage.width;
- g_temp_h = m_inputImage.height;
-
- }
- //ŠO•”ƒpƒ^[ƒ“‚ðŽæ“¾
- if (key == ' ' && m_inputImageIn.isNew() && InParameter == 1) {
-
- //s—ñ‚̶¬
- CvMat *worldCoordinates = cvCreateMat((m_board_w * m_board_h), 3, CV_64FC1); //¢ŠEÀ•W—ps—ñ
- CvMat *imageCoordinates = cvCreateMat((m_board_w * m_board_h), 2, CV_64FC1); //‰æ‘œÀ•W—ps—ñ
- CvMat *rotationVectors = cvCreateMat(1, 3, CV_64FC1); //‰ñ“]ƒxƒNƒgƒ‹
- CvMat *rotationMatrix = cvCreateMat(3, 3, CV_64FC1); //‰ñ“]s—ñ
- CvMat *translationVectors = cvCreateMat(1, 3, CV_64FC1);
-
- //¢ŠEÀ•W‚ðÝ’è‚·‚é
- for (int i = 0; i < (m_board_w * m_board_h); i++){
- cvSetReal2D(worldCoordinates, i, 0, (i % m_board_w) * UNIT);
- cvSetReal2D(worldCoordinates, i, 1, (i / m_board_w) * UNIT);
- cvSetReal2D(worldCoordinates, i, 2, 0.0);
- }
-
- cvWaitKey( 1 );
-
- // ƒXƒy[ƒXƒL[‚ª‰Ÿ‚³‚ꂽ‚ç
- if ( findFlag != 0 ) {
- // ƒR[ƒi[‚ª‚·‚ׂČŸo‚³‚ꂽê‡
- // ‰æ‘œÀ•W‚ðÝ’è‚·‚é
- for ( int i = 0; i < (m_board_w * m_board_h); i++ ){
- cvSetReal2D( imageCoordinates, i, 0, corners[i].x);
- cvSetReal2D( imageCoordinates, i, 1, corners[i].y);
- }
-
- // ŠO•”ƒpƒ‰ƒ[ƒ^‚ð„’è‚·‚é
- cvFindExtrinsicCameraParams2(
- worldCoordinates,
- imageCoordinates,
- intrinsicMatrix,
- distortionCoefficient,
- rotationVectors,
- translationVectors
- );
-
- // ‰ñ“]ƒxƒNƒgƒ‹‚ð‰ñ“]s—ñ‚É•ÏŠ·‚·‚é
- cvRodrigues2( rotationVectors, rotationMatrix, NULL );
-
- printf( "\nŠO•”ƒpƒ‰ƒ[ƒ^\n" );
- printExtrinsicMatrix( rotationMatrix, translationVectors );
- saveExternalParameterMatrix(rotationMatrix, translationVectors);
-
- m_externalParameter.data = CORBA::string_dup(externalParameter);
- m_renseParameter.data = CORBA::string_dup(renseParameters);
- m_internalParameter.data = CORBA::string_dup(internalParameter);
-
- }
- //ƒƒ‚ƒŠ‚ð‰ð•ú
- cvReleaseMat( &worldCoordinates );
- cvReleaseMat( &imageCoordinates );
- cvReleaseMat( &rotationVectors );
- cvReleaseMat( &rotationMatrix );
- cvReleaseMat( &translationVectors );
-
- //X,Y‰Šú‰»
- cvInitUndistortMap(
- intrinsicMatrix,
- distortionCoefficient,
- mapx,
- mapy
- );
- //ŠO•”ƒpƒ‰ƒ[ƒ^Šm”Fƒtƒ‰ƒO
- outParameter = 1;
- key = 0;
-
- }
-
- //“à•”ŠO•”ƒpƒ‰ƒ[ƒ^‚Ìo—͂ɬŒ÷‚µ‚½‚ç
- if (InParameter == 1 && outParameter == 1) {
-
- // ƒŒƒ“ƒY˜c‚Ý‚ð•â³‚µ‚½‰æ‘œ‚𶬂·‚é
- cvUndistort2(
- inputImage_buff,
- undistortionImage,
- intrinsicMatrix,
- distortionCoefficient
- );
-
- //cvShowImage("˜c‚Ý•â³", undistortionImage);
-
- //OutPort‚ɕⳉf‘œ‚ðo—Í‚·‚éB
- //int len = undistortionImage->nChannels * undistortionImage->width * undistortionImage->height;
- //m_calbImage.pixels.length(len);
-
- //˜c‚ݕⳉf‘œ‚ðOutPort‚Æ‚µ‚ăƒ‚ƒŠƒRƒs[‚·‚éB
- //memcpy((void *)&(m_calbImage.pixels[0]), undistortionImage->imageData, len);
- //m_calbImageOut.write();
-
- //’¹áÕ}‚ÌÀ•WÝ’è
- objPts[0].x = 0; objPts[0].y = 0;
- objPts[1].x = m_board_w-1; objPts[1].y = 0;
- objPts[2].x = 0; objPts[2].y = m_board_h-1;
- objPts[3].x = m_board_w-1; objPts[3].y = m_board_h-1;
-
- //Žæ“¾‚·‚éCorner‚ðÝ’è
- imgPts[0] = corners[0];
- imgPts[1] = corners[m_board_w - 1];
- imgPts[2] = corners[(m_board_h - 1) * m_board_w];
- imgPts[3] = corners[(m_board_h - 1) * m_board_w + m_board_w - 1];
-
- //Žw’肵‚½Corner‚É›‚ð쬂·‚é
- cvCircle(tempImage_buff, cvPointFrom32f(imgPts[0]), 9, CV_RGB(0,0,255), 3);
- cvCircle(tempImage_buff, cvPointFrom32f(imgPts[1]), 9, CV_RGB(0,255,0), 3);
- cvCircle(tempImage_buff, cvPointFrom32f(imgPts[2]), 9, CV_RGB(255,0,0), 3);
- cvCircle(tempImage_buff, cvPointFrom32f(imgPts[3]), 9, CV_RGB(255,255,0), 3);
-
- CvMat *H = cvCreateMat(3, 3, CV_32F);
- cvGetPerspectiveTransform(objPts, imgPts, H);
-
- //‚‚³‚ðÝ’è‚·‚éB
- CV_MAT_ELEM(*H, float, 2, 2) = m_camera_Height;
-
- //Warpping‚ðŽÀs
- cvWarpPerspective(inputImage_buff, birds_image, H, CV_INTER_LINEAR | CV_WARP_INVERSE_MAP | CV_WARP_FILL_OUTLIERS);
-
- //’¹áÕ}‚ðOutPort‚Éo—Í‚·‚éB
- int len = birds_image->nChannels * birds_image->width * birds_image->height;
- m_birdImage.pixels.length(len);
- memcpy((void *)&(m_birdImage.pixels[0]), birds_image->imageData, len);
-
- m_birdImage.width = inputImage_buff->width;
- m_birdImage.height = inputImage_buff->height;
-
- m_birdImageOut.write();
-
- cvWaitKey(10);
-
- //cvShowImage("Bird_Eye", birds_image);
- cvReleaseMat(&H);
-
- g_temp_w = m_inputImage.width;
- g_temp_h = m_inputImage.height;
-
- key = 0;
-
- }
-
- //cvShowImage("Capture", inputImage_buff);
-
- if (InParameter == 1 && outParameter == 1) {
-
- m_renseParameterOut.write();
- m_internalParameterOut.write();
- m_externalParameterOut.write();
- }
-
- if (g_temp_w != m_inputImage.width || g_temp_h != m_inputImage.height){
-
- if(intrinsicMatrix==NULL){
- cvReleaseMat(&intrinsicMatrix);
- }
- if(distortionCoefficient==NULL){
- cvReleaseMat(&distortionCoefficient);
- }
-
- if(mapx==NULL){
- cvReleaseImage(&mapx);
- }
- if(mapy==NULL){
- cvReleaseImage(&mapy);
- }
- if(inputImage_buff==NULL){
- cvReleaseImage(&inputImage_buff);
- }
- if(outputImage_buff==NULL){
- cvReleaseImage(&outputImage_buff);
- }
- if(tempImage_buff==NULL){
- cvReleaseImage(&tempImage_buff);
- }
- if(birds_image==NULL){
- cvReleaseImage(&birds_image);
- }
- if(undistortionImage==NULL){
- cvReleaseImage(&undistortionImage);
- }
-
- //g_temp_w = m_inputImage.width;
- //g_temp_h = m_inputImage.height;
- InParameter = 0;
- InParameter = 0;
-
- key = 0;
- }
-
- return RTC::RTC_OK;
-}
-
-/*
-RTC::ReturnCode_t ImageCalibration::onAborting(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-/*
-RTC::ReturnCode_t ImageCalibration::onError(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-/*
-RTC::ReturnCode_t ImageCalibration::onReset(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-/*
-RTC::ReturnCode_t ImageCalibration::onStateUpdate(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-/*
-RTC::ReturnCode_t ImageCalibration::onRateChanged(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-
-
-extern "C"
-{
-
- void ImageCalibrationInit(RTC::Manager* manager)
- {
- coil::Properties profile(imagecalibration_spec);
- manager->registerFactory(profile,
- RTC::Create<ImageCalibration>,
- RTC::Delete<ImageCalibration>);
- }
-
-};
-
-
+// -*- C++ -*-
+/*!
+ * @file ImageCalibration.cpp
+ * @brief Image Calibration
+ * @date $Date$
+ *
+ * $Id$
+ */
+
+#include "ImageCalibration.h"
+
+// Module specification
+// <rtc-template block="module_spec">
+static const char* imagecalibration_spec[] =
+ {
+ "implementation_id", "ImageCalibration",
+ "type_name", "ImageCalibration",
+ "description", "Image Calibration",
+ "version", "1.1.0",
+ "vendor", "AIST",
+ "category", "Category",
+ "activity_type", "PERIODIC",
+ "kind", "DataFlowComponent",
+ "max_instance", "1",
+ "language", "C++",
+ "lang_type", "compile",
+ // Configuration variables
+ "conf.default.checker_w", "13",
+ "conf.default.checker_h", "9",
+ "conf.default.image_num", "5",
+ // Widget
+ "conf.__widget__.checker_w", "text",
+ "conf.__widget__.checker_h", "text",
+ "conf.__widget__.image_num", "text",
+ // Constraints
+ ""
+ };
+// </rtc-template>
+
+/*!
+ * @brief constructor
+ * @param manager Maneger Object
+ */
+ImageCalibration::ImageCalibration(RTC::Manager* manager)
+ // <rtc-template block="initializer">
+ : RTC::DataFlowComponentBase(manager),
+ m_img_origIn("original_image", m_img_orig),
+ m_img_checkOut("checker_image", m_img_check),
+ m_CameraCalibrationServicePort("CameraCalibrationService")
+
+ // </rtc-template>
+{
+}
+
+/*!
+ * @brief destructor
+ */
+ImageCalibration::~ImageCalibration()
+{
+}
+
+
+
+RTC::ReturnCode_t ImageCalibration::onInitialize()
+{
+ // Registration: InPort/OutPort/Service
+ // <rtc-template block="registration">
+ // Set InPort buffers
+ addInPort("original_image", m_img_origIn);
+
+ // Set OutPort buffer
+ addOutPort("checker_image", m_img_checkOut);
+
+ // Set service provider to Ports
+ m_CameraCalibrationServicePort.registerProvider("CalibrationService", "ImageCalibService::CalibrationService", m_CalibrationService);
+
+ // Set service consumers to Ports
+
+ // Set CORBA Service Ports
+ addPort(m_CameraCalibrationServicePort);
+
+ // </rtc-template>
+
+ // <rtc-template block="bind_config">
+ // Bind variables and configuration variable
+ bindParameter("checker_w", m_checker_w, "13");
+ bindParameter("checker_h", m_checker_h, "9");
+ bindParameter("image_num", m_image_num, "5");
+ // </rtc-template>
+
+ m_CalibrationService.setCheckerSize(m_checker_w, m_checker_h);
+
+ return RTC::RTC_OK;
+}
+
+/*
+RTC::ReturnCode_t ImageCalibration::onFinalize()
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t ImageCalibration::onStartup(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t ImageCalibration::onShutdown(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+
+RTC::ReturnCode_t ImageCalibration::onActivated(RTC::UniqueId ec_id)
+{
+ /* ãƒã‚§ã‚¹ãƒœãƒ¼ãƒ‰æ’®å½±æžšæ•°ã‚»ãƒƒãƒˆ */
+ m_current_image_num = m_image_num;
+ m_CalibrationService.setImageNumber(m_current_image_num);
+
+ return RTC::RTC_OK;
+}
+
+
+RTC::ReturnCode_t ImageCalibration::onDeactivated(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+
+
+RTC::ReturnCode_t ImageCalibration::onExecute(RTC::UniqueId ec_id)
+{
+ cv::Mat image, gray;
+ cv::vector<cv::Point2f> imagePoints; /* ãƒã‚§ãƒƒã‚«ãƒ¼äº¤ç‚¹åº§æ¨™ã‚’æ ¼ç´ã™ã‚‹è¡Œåˆ— */
+
+ /* コーナーä½ç½®é«˜ç²¾åº¦åŒ–ã®ãŸã‚ã®ç¹°ã‚Šè¿”ã—処ç†ã®åœæ¢åŸºæº–
+ * 「å復回数ãŒ20回ã«é”ã™ã‚‹ã€ã¾ãŸã¯ã€Œã‚¤ãƒ—ã‚·ãƒãƒ³ãŒ0.001ã«é”ã™ã‚‹ã€ã©ã¡ã‚‰ã‹ã®æ¡ä»¶ã‚’満ãŸã—ãŸæ™‚ã«çµ‚了ã™ã‚‹
+ */
+ cv::TermCriteria criteria( CV_TERMCRIT_ITER | CV_TERMCRIT_EPS, 20, 0.001 );
+
+ if(m_img_origIn.isNew())
+ {
+ /* ãƒã‚§ã‚¹ãƒœãƒ¼ãƒ‰æ’®å½±æžšæ•°ç¢ºèª */
+ checkImageNum();
+
+ /* データã®èªã¿è¾¼ã¿ */
+ m_img_origIn.read();
+
+ /* イメージ用メモリã®ç¢ºä¿ */
+ image.create(m_img_orig.height, m_img_orig.width, CV_8UC3);
+ gray.create(m_img_orig.height, m_img_orig.width, CV_8UC1);
+
+ /* InPortã®æ˜ åƒãƒ‡ãƒ¼ã‚¿ */
+ memcpy(image.data,(void *)&(m_img_orig.pixels[0]), m_img_orig.pixels.length());
+
+ /* グレースケールã«å¤‰æ› */
+ cv::cvtColor(image, gray, CV_BGR2GRAY);
+
+ /* プãƒãƒã‚¤ãƒ€ã‚¯ãƒ©ã‚¹ã¸ãƒ‡ãƒ¼ã‚¿ã‚’渡㙠*/
+ RTC::CameraImage currentImg;
+ int len = gray.channels() * gray.cols * gray.rows;
+ currentImg.pixels.length(len);
+ currentImg.width = gray.cols;
+ currentImg.height = gray.rows;
+ memcpy((void *)&(currentImg.pixels[0]), gray.data, len);
+ m_CalibrationService.setCurrentImage(¤tImg);
+
+ /* ãƒã‚§ãƒƒã‚«ãƒ¼ãƒ‘ターンã®äº¤ç‚¹æ¤œå‡º */
+ if(cv::findChessboardCorners(gray, cv::Size(m_checker_w, m_checker_h), imagePoints))
+ {
+ /* 検出点をæç”» */
+ cv::cornerSubPix(gray, imagePoints, cv::Size(11,11), cv::Size(-1,-1), criteria );
+ cv::drawChessboardCorners(image, cv::Size(m_checker_w, m_checker_h), (cv::Mat)imagePoints, true );
+ }
+
+ /* ç”»åƒãƒ‡ãƒ¼ã‚¿ã®ã‚µã‚¤ã‚ºå–å¾— */
+ len = image.channels() * image.cols * image.rows;
+ m_img_check.pixels.length(len);
+ m_img_check.width = image.cols;
+ m_img_check.height = image.rows;
+
+ /* ç”»åƒãƒ‡ãƒ¼ã‚¿ã‚’OutPortã«ã‚³ãƒ”ー */
+ memcpy((void *)&(m_img_check.pixels[0]), image.data, len);
+
+ m_img_checkOut.write();
+ }
+ return RTC::RTC_OK;
+}
+
+/*
+RTC::ReturnCode_t ImageCalibration::onAborting(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t ImageCalibration::onError(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t ImageCalibration::onReset(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t ImageCalibration::onStateUpdate(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t ImageCalibration::onRateChanged(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/* ãƒã‚§ã‚¹ãƒœãƒ¼ãƒ‰æ’®å½±æžšæ•°ç¢ºèª
+ * 枚数を変更ã•ã‚ŒãŸã‚‰GUIã‚’å†æç”»ã—ã€ãã‚Œã¾ã§ã®ä¿å˜ç”»åƒã‚’削除ã™ã‚‹
+ */
+void ImageCalibration::checkImageNum(void)
+{
+ if(m_current_image_num == m_image_num) return;
+ m_current_image_num = m_image_num;
+ m_CalibrationService.setImageNumber(m_image_num);
+ return;
+}
+
+extern "C"
+{
+
+ void ImageCalibrationInit(RTC::Manager* manager)
+ {
+ coil::Properties profile(imagecalibration_spec);
+ manager->registerFactory(profile,
+ RTC::Create<ImageCalibration>,
+ RTC::Delete<ImageCalibration>);
+ }
+
+};
+
+
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/src/ImageCalibrationComp.cpp
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/src/ImageCalibrationComp.cpp 2014-03-14 07:19:56 UTC (rev 118)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/ImageCalibration/src/ImageCalibrationComp.cpp 2014-03-14 08:18:42 UTC (rev 119)
@@ -1,97 +1,97 @@
-// -*- C++ -*-
-/*!
- * @file ImageCalibrationComp.cpp
- * @brief Standalone component
- * @date $Date$
- *
- * $Id$
- */
-
-#include <rtm/Manager.h>
-#include <iostream>
-#include <string>
-#include <stdlib.h>
-#include "ImageCalibration.h"
-
-
-void MyModuleInit(RTC::Manager* manager)
-{
- ImageCalibrationInit(manager);
- RTC::RtcBase* comp;
-
- // Create a component
- comp = manager->createComponent("ImageCalibration");
-
- if (comp==NULL)
- {
- std::cerr << "Component create failed." << std::endl;
- abort();
- }
-
- // Example
- // The following procedure is examples how handle RT-Components.
- // These should not be in this function.
-
- // Get the component's object reference
-// RTC::RTObject_var rtobj;
-// rtobj = RTC::RTObject::_narrow(manager->getPOA()->servant_to_reference(comp));
-
- // Get the port list of the component
-// PortServiceList* portlist;
-// portlist = rtobj->get_ports();
-
- // getting port profiles
-// std::cout << "Number of Ports: ";
-// std::cout << portlist->length() << std::endl << std::endl;
-// for (CORBA::ULong i(0), n(portlist->length()); i < n; ++i)
-// {
-// PortService_ptr port;
-// port = (*portlist)[i];
-// std::cout << "Port" << i << " (name): ";
-// std::cout << port->get_port_profile()->name << std::endl;
-//
-// RTC::PortInterfaceProfileList iflist;
-// iflist = port->get_port_profile()->interfaces;
-// std::cout << "---interfaces---" << std::endl;
-// for (CORBA::ULong i(0), n(iflist.length()); i < n; ++i)
-// {
-// std::cout << "I/F name: ";
-// std::cout << iflist[i].instance_name << std::endl;
-// std::cout << "I/F type: ";
-// std::cout << iflist[i].type_name << std::endl;
-// const char* pol;
-// pol = iflist[i].polarity == 0 ? "PROVIDED" : "REQUIRED";
-// std::cout << "Polarity: " << pol << std::endl;
-// }
-// std::cout << "---properties---" << std::endl;
-// NVUtil::dump(port->get_port_profile()->properties);
-// std::cout << "----------------" << std::endl << std::endl;
-// }
-
- return;
-}
-
-int main (int argc, char** argv)
-{
- RTC::Manager* manager;
- manager = RTC::Manager::init(argc, argv);
-
- // Initialize manager
- manager->init(argc, argv);
-
- // Set module initialization proceduer
- // This procedure will be invoked in activateManager() function.
- manager->setModuleInitProc(MyModuleInit);
-
- // Activate manager and register to naming service
- manager->activateManager();
-
- // run the manager in blocking mode
- // runManager(false) is the default.
- manager->runManager();
-
- // If you want to run the manager in non-blocking mode, do like this
- // manager->runManager(true);
-
- return 0;
-}
+// -*- C++ -*-
+/*!
+ * @file ImageCalibrationComp.cpp
+ * @brief Standalone component
+ * @date $Date$
+ *
+ * $Id$
+ */
+
+#include <rtm/Manager.h>
+#include <iostream>
+#include <string>
+#include <stdlib.h>
+#include "ImageCalibration.h"
+
+
+void MyModuleInit(RTC::Manager* manager)
+{
+ ImageCalibrationInit(manager);
+ RTC::RtcBase* comp;
+
+ // Create a component
+ comp = manager->createComponent("ImageCalibration");
+
+ if (comp==NULL)
+ {
+ std::cerr << "Component create failed." << std::endl;
+ abort();
+ }
+
+ // Example
+ // The following procedure is examples how handle RT-Components.
+ // These should not be in this function.
+
+ // Get the component's object reference
+// RTC::RTObject_var rtobj;
+// rtobj = RTC::RTObject::_narrow(manager->getPOA()->servant_to_reference(comp));
+
+ // Get the port list of the component
+// PortServiceList* portlist;
+// portlist = rtobj->get_ports();
+
+ // getting port profiles
+// std::cout << "Number of Ports: ";
+// std::cout << portlist->length() << std::endl << std::endl;
+// for (CORBA::ULong i(0), n(portlist->length()); i < n; ++i)
+// {
+// PortService_ptr port;
+// port = (*portlist)[i];
+// std::cout << "Port" << i << " (name): ";
+// std::cout << port->get_port_profile()->name << std::endl;
+//
+// RTC::PortInterfaceProfileList iflist;
+// iflist = port->get_port_profile()->interfaces;
+// std::cout << "---interfaces---" << std::endl;
+// for (CORBA::ULong i(0), n(iflist.length()); i < n; ++i)
+// {
+// std::cout << "I/F name: ";
+// std::cout << iflist[i].instance_name << std::endl;
+// std::cout << "I/F type: ";
+// std::cout << iflist[i].type_name << std::endl;
+// const char* pol;
+// pol = iflist[i].polarity == 0 ? "PROVIDED" : "REQUIRED";
+// std::cout << "Polarity: " << pol << std::endl;
+// }
+// std::cout << "---properties---" << std::endl;
+// NVUtil::dump(port->get_port_profile()->properties);
+// std::cout << "----------------" << std::endl << std::endl;
+// }
+
+ return;
+}
+
+int main (int argc, char** argv)
+{
+ RTC::Manager* manager;
+ manager = RTC::Manager::init(argc, argv);
+
+ // Initialize manager
+ manager->init(argc, argv);
+
+ // Set module initialization proceduer
+ // This procedure will be invoked in activateManager() function.
+ manager->setModuleInitProc(MyModuleInit);
+
+ // Activate manager and register to naming service
+ manager->activateManager();
+
+ // run the manager in blocking mode
+ // runManager(false) is the default.
+ manager->runManager();
+
+ // If you want to run the manager in non-blocking mode, do like this
+ // manager->runManager(true);
+
+ return 0;
+}
More information about the openrtm-commit
mailing list