[openrtm-commit:01135] r105 - in branches/newCMakeForVC2010/ImageProcessing/opencv/components: . Houghline Houghline/cmake Houghline/cmake/Modules Houghline/doc Houghline/doc/content Houghline/idl Houghline/include Houghline/include/Hough Houghline/src
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2013年 11月 29日 (金) 15:25:56 JST
Author: kawauchi
Date: 2013-11-29 15:25:56 +0900 (Fri, 29 Nov 2013)
New Revision: 105
Added:
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/.project
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/COPYING
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/COPYING.LESSER
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/Hough.conf
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/README.Hough
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/RTC.xml
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/License.rtf
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/Modules/
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/Modules/FindOpenRTM.cmake
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/cpack_options.cmake.in
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/hough-config-version.cmake.in
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/hough-config.cmake.in
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/hough.pc.in
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/uninstall_target.cmake.in
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/utils.cmake
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/wix.xsl.in
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/doc/
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/doc/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/doc/conf.py.in
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/doc/content/
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/doc/content/index.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/doc/content/index_j.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/doc/doxyfile.in
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/idl/
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/idl/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/include/
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/include/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/include/Hough/
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/include/Hough/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/include/Hough/Hough.h
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/rtc.conf
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/src/
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/src/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/src/Hough.cpp
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/src/HoughComp.cpp
Log:
Configuration nine items added. Bug fixes in the image memory allocation processing. refs #2704
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/.project
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/.project (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/.project 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>Houghline</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/CMakeLists.txt (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/CMakeLists.txt 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +1,110 @@
+cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
+cmake_policy(SET CMP0002 OLD)
+
+project(Hough)
+string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
+include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
+set(PROJECT_VERSION 1.0.0 CACHE STRING "Hough version")
+DISSECT_VERSION()
+set(PROJECT_DESCRIPTION "Hough line 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 (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)
+
+
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/COPYING
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/COPYING (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/COPYING 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +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>.
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/COPYING.LESSER
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/COPYING.LESSER (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/COPYING.LESSER 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +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.
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/Hough.conf
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/Hough.conf (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/Hough.conf 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +1,140 @@
+# -*- sh -*-
+#------------------------------------------------------------
+# Configuration file for Hough
+#
+# This configuration file name should be specified in rtc.conf (or other
+# configuration file specified by -f option) by "config_file" property.
+#
+# Category.Hough.config_file: Hough.conf
+# or
+# Category.Hough0.config_file: Hough0.conf
+# Category.Hough1.config_file: Hough1.conf
+# Category.Hough2.config_file: Hough2.conf
+#
+# ------------------------------------------------------------
+# An example configuration file for Hough
+#
+# 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__.canny_thresld1, slider.1
+# conf.__widget__.canny_thresld2, slider.1
+# conf.__widget__.hough_method, radio
+# conf.__widget__.hough_thresld, slider.1
+# conf.__widget__.hough_param1, text
+# conf.__widget__.hough_param2, text
+# conf.__widget__.line_color_R, text
+# conf.__widget__.line_color_G, text
+# conf.__widget__.line_color_B, text
+# conf.__widget__.line_thickness, text
+# conf.__widget__.line_type, radio
+
+
+# conf.__constraints__.canny_thresld1, 0<=x<=255
+# conf.__constraints__.canny_thresld2, 0<=x<=255
+# conf.__constraints__.hough_method, (PROBABILISTIC,STANDARD,MULTI_SCALE)
+# conf.__constraints__.hough_thresld, 0<=x<=255
+# conf.__constraints__.line_type, (8,4,CV_AA)
+
+##============================================================
+## 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
+
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/README.Hough
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/README.Hough (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/README.Hough 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +1,224 @@
+======================================================================
+ RTComponent: Hough specificatioin
+
+ OpenRTM-aist-1.0.0
+ Date: $Date$
+
+ This file is generated by rtc-template with the following argments.
+
+# rtc-template -bcxx --module-name=Hough
+# --module-desc='Hough line 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=canny_thresld1:int:100 --config=canny_thresld2:int:100 --config=hough_method:string:PROBABILISTIC --config=hough_thresld:int:50 --config=hough_param1:double:50 --config=hough_param2:double:10 --config=line_color_R:int:255 --config=line_color_G:int:0 --config=line_color_B:int:0 --config=line_thickness:int:2 --config=line_type:string:8
+# --inport=origin_image:RTC::CameraImage --outport=houghline_image:RTC::CameraImage
+
+
+======================================================================
+ Basic Information
+======================================================================
+# <rtc-template block="module">
+Module Name: Hough
+Description: Hough line 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: origin_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: houghline_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">
+# </rtc-template>
+
+======================================================================
+ Configuration definition
+======================================================================
+# <rtc-template block="configuration">
+ Configuration:
+ Name: canny_thresld1
+ Description:
+ Type: int
+ DefaultValue: 100
+ Unit:
+ Range:
+ Constraint:
+
+ Name: canny_thresld2
+ Description:
+ Type: int
+ DefaultValue: 100
+ Unit:
+ Range:
+ Constraint:
+
+ Name: hough_method
+ Description:
+ Type: string
+ DefaultValue: PROBABILISTIC
+ Unit:
+ Range:
+ Constraint:
+
+ Name: hough_thresld
+ Description:
+ Type: int
+ DefaultValue: 50
+ Unit:
+ Range:
+ Constraint:
+
+ Name: hough_param1
+ Description:
+ Type: double
+ DefaultValue: 50
+ Unit:
+ Range:
+ Constraint:
+
+ Name: hough_param2
+ Description:
+ Type: double
+ DefaultValue: 10
+ Unit:
+ Range:
+ Constraint:
+
+ Name: line_color_R
+ Description:
+ Type: int
+ DefaultValue: 255
+ Unit:
+ Range:
+ Constraint:
+
+ Name: line_color_G
+ Description:
+ Type: int
+ DefaultValue: 0
+ Unit:
+ Range:
+ Constraint:
+
+ Name: line_color_B
+ Description:
+ Type: int
+ DefaultValue: 0
+ Unit:
+ Range:
+ Constraint:
+
+ Name: line_thickness
+ Description:
+ Type: int
+ DefaultValue: 2
+ Unit:
+ Range:
+ Constraint:
+
+ Name: line_type
+ Description:
+ Type: string
+ DefaultValue: 8
+ 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.
+
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/RTC.xml
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/RTC.xml (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/RTC.xml 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Hough: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="Houghline" rtc:updateDate="2013-11-21T12:45:44+09:00" rtc:creationDate="2013-11-20T13:45:21+09:00" rtc:version="1.0.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Hough line component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Hough"/>
+ <rtc:Actions>
+ <rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
+ <rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
+ <rtc:OnStartup xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
+ <rtc:OnShutdown xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
+ <rtc:OnActivated xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
+ <rtc:OnDeactivated xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
+ <rtc:OnAborting xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
+ <rtc:OnError xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
+ <rtc:OnReset xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
+ <rtc:OnExecute xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
+ <rtc:OnStateUpdate xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
+ <rtc:OnRateChanged xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
+ <rtc:OnAction xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
+ <rtc:OnModeChanged xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
+ </rtc:Actions>
+ <rtc:ConfigurationSet>
+ <rtc:Configuration xsi:type="rtcExt:configuration_ext" rtcExt:variableName="canny_threshold1" rtc:unit="" rtc:defaultValue="100" rtc:type="int" rtc:name="canny_thresld1">
+ <rtc:Constraint>
+ <rtc:ConstraintUnitType>
+ <rtc:propertyIsBetween>
+ <rtc:LowerBoundary>0</rtc:LowerBoundary>
+ <rtc:UpperBoundary>255</rtc:UpperBoundary>
+ </rtc:propertyIsBetween>
+ </rtc:ConstraintUnitType>
+ </rtc:Constraint>
+ <rtcExt:Properties rtcExt:value="slider.1" rtcExt:name="__widget__"/>
+ </rtc:Configuration>
+ <rtc:Configuration xsi:type="rtcExt:configuration_ext" rtcExt:variableName="canny_threshold2" rtc:unit="" rtc:defaultValue="100" rtc:type="int" rtc:name="canny_thresld2">
+ <rtc:Constraint>
+ <rtc:ConstraintUnitType>
+ <rtc:propertyIsBetween>
+ <rtc:LowerBoundary>0</rtc:LowerBoundary>
+ <rtc:UpperBoundary>255</rtc:UpperBoundary>
+ </rtc:propertyIsBetween>
+ </rtc:ConstraintUnitType>
+ </rtc:Constraint>
+ <rtcExt:Properties rtcExt:value="slider.1" rtcExt:name="__widget__"/>
+ </rtc:Configuration>
+ <rtc:Configuration xsi:type="rtcExt:configuration_ext" rtcExt:variableName="hough_method" rtc:unit="" rtc:defaultValue="PROBABILISTIC" rtc:type="string" rtc:name="hough_method">
+ <rtc:Constraint>
+ <rtc:ConstraintUnitType>
+ <rtc:Or>
+ <rtc:Constraint>
+ <rtc:ConstraintUnitType>
+ <rtc:propertyIsEqualTo rtc:matchCase="false">
+ <rtc:Literal>PROBABILISTIC</rtc:Literal>
+ </rtc:propertyIsEqualTo>
+ </rtc:ConstraintUnitType>
+ </rtc:Constraint>
+ <rtc:Constraint>
+ <rtc:ConstraintUnitType>
+ <rtc:propertyIsEqualTo rtc:matchCase="false">
+ <rtc:Literal>STANDARD</rtc:Literal>
+ </rtc:propertyIsEqualTo>
+ </rtc:ConstraintUnitType>
+ </rtc:Constraint>
+ <rtc:Constraint>
+ <rtc:ConstraintUnitType>
+ <rtc:propertyIsEqualTo rtc:matchCase="false">
+ <rtc:Literal>MULTI_SCALE</rtc:Literal>
+ </rtc:propertyIsEqualTo>
+ </rtc:ConstraintUnitType>
+ </rtc:Constraint>
+ </rtc:Or>
+ </rtc:ConstraintUnitType>
+ </rtc:Constraint>
+ <rtcExt:Properties rtcExt:value="radio" rtcExt:name="__widget__"/>
+ </rtc:Configuration>
+ <rtc:Configuration xsi:type="rtcExt:configuration_ext" rtcExt:variableName="hough_threshold" rtc:unit="" rtc:defaultValue="50" rtc:type="int" rtc:name="hough_thresld">
+ <rtc:Constraint>
+ <rtc:ConstraintUnitType>
+ <rtc:propertyIsBetween>
+ <rtc:LowerBoundary>0</rtc:LowerBoundary>
+ <rtc:UpperBoundary>255</rtc:UpperBoundary>
+ </rtc:propertyIsBetween>
+ </rtc:ConstraintUnitType>
+ </rtc:Constraint>
+ <rtcExt:Properties rtcExt:value="slider.1" rtcExt:name="__widget__"/>
+ </rtc:Configuration>
+ <rtc:Configuration xsi:type="rtcExt:configuration_ext" rtcExt:variableName="hough_param1" rtc:unit="" rtc:defaultValue="50" rtc:type="double" rtc:name="hough_param1">
+ <rtcExt:Properties rtcExt:value="text" rtcExt:name="__widget__"/>
+ </rtc:Configuration>
+ <rtc:Configuration xsi:type="rtcExt:configuration_ext" rtcExt:variableName="hough_param2" rtc:unit="" rtc:defaultValue="10" rtc:type="double" rtc:name="hough_param2">
+ <rtcExt:Properties rtcExt:value="text" rtcExt:name="__widget__"/>
+ </rtc:Configuration>
+ <rtc:Configuration xsi:type="rtcExt:configuration_ext" rtcExt:variableName="line_color_R" rtc:unit="" rtc:defaultValue="255" rtc:type="int" rtc:name="line_color_R">
+ <rtcExt:Properties rtcExt:value="text" rtcExt:name="__widget__"/>
+ </rtc:Configuration>
+ <rtc:Configuration xsi:type="rtcExt:configuration_ext" rtcExt:variableName="line_color_G" rtc:unit="" rtc:defaultValue="0" rtc:type="int" rtc:name="line_color_G">
+ <rtcExt:Properties rtcExt:value="text" rtcExt:name="__widget__"/>
+ </rtc:Configuration>
+ <rtc:Configuration xsi:type="rtcExt:configuration_ext" rtcExt:variableName="line_color_B" rtc:unit="" rtc:defaultValue="0" rtc:type="int" rtc:name="line_color_B">
+ <rtcExt:Properties rtcExt:value="text" rtcExt:name="__widget__"/>
+ </rtc:Configuration>
+ <rtc:Configuration xsi:type="rtcExt:configuration_ext" rtcExt:variableName="line_thickness" rtc:unit="" rtc:defaultValue="2" rtc:type="int" rtc:name="line_thickness">
+ <rtcExt:Properties rtcExt:value="text" rtcExt:name="__widget__"/>
+ </rtc:Configuration>
+ <rtc:Configuration xsi:type="rtcExt:configuration_ext" rtcExt:variableName="line_type" rtc:unit="" rtc:defaultValue="8" rtc:type="string" rtc:name="line_type">
+ <rtc:Constraint>
+ <rtc:ConstraintUnitType>
+ <rtc:Or>
+ <rtc:Constraint>
+ <rtc:ConstraintUnitType>
+ <rtc:propertyIsEqualTo rtc:matchCase="false">
+ <rtc:Literal>8</rtc:Literal>
+ </rtc:propertyIsEqualTo>
+ </rtc:ConstraintUnitType>
+ </rtc:Constraint>
+ <rtc:Constraint>
+ <rtc:ConstraintUnitType>
+ <rtc:propertyIsEqualTo rtc:matchCase="false">
+ <rtc:Literal>4</rtc:Literal>
+ </rtc:propertyIsEqualTo>
+ </rtc:ConstraintUnitType>
+ </rtc:Constraint>
+ <rtc:Constraint>
+ <rtc:ConstraintUnitType>
+ <rtc:propertyIsEqualTo rtc:matchCase="false">
+ <rtc:Literal>CV_AA</rtc:Literal>
+ </rtc:propertyIsEqualTo>
+ </rtc:ConstraintUnitType>
+ </rtc:Constraint>
+ </rtc:Or>
+ </rtc:ConstraintUnitType>
+ </rtc:Constraint>
+ <rtcExt:Properties rtcExt:value="radio" rtcExt:name="__widget__"/>
+ </rtc:Configuration>
+ </rtc:ConfigurationSet>
+ <rtc:DataPorts xsi:type="rtcExt:dataport_ext" rtcExt:position="LEFT" rtcExt:variableName="image_orig" rtc:unit="" rtc:subscriptionType="" rtc:dataflowType="" rtc:interfaceType="" rtc:idlFile="" rtc:type="RTC::CameraImage" rtc:name="origin_image" rtc:portType="DataInPort"/>
+ <rtc:DataPorts xsi:type="rtcExt:dataport_ext" rtcExt:position="RIGHT" rtcExt:variableName="image_hough" rtc:unit="" rtc:subscriptionType="" rtc:dataflowType="" rtc:interfaceType="" rtc:idlFile="" rtc:type="RTC::CameraImage" rtc:name="houghline_image" rtc:portType="DataOutPort"/>
+ <rtc:Language xsi:type="rtcExt:language_ext" rtc:kind="C++"/>
+</rtc:RtcProfile>
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/CMakeLists.txt (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/CMakeLists.txt 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +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)
+
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/License.rtf
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/License.rtf (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/License.rtf 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +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
+}
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/Modules/FindOpenRTM.cmake
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/Modules/FindOpenRTM.cmake (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/Modules/FindOpenRTM.cmake 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +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)
+
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/cpack_options.cmake.in
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/cpack_options.cmake.in (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/cpack_options.cmake.in 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +1,94 @@
+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)
+
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/hough-config-version.cmake.in
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/hough-config-version.cmake.in (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/hough-config-version.cmake.in 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +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)
+
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/hough-config.cmake.in
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/hough-config.cmake.in (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/hough-config.cmake.in 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +1,54 @@
+# Hough CMake config file
+#
+# This file sets the following variables:
+# Hough_FOUND - Always TRUE.
+# Hough_INCLUDE_DIRS - Directories containing the Hough include files.
+# Hough_IDL_DIRS - Directories containing the Hough IDL files.
+# Hough_LIBRARIES - Libraries needed to use Hough.
+# Hough_DEFINITIONS - Compiler flags for Hough.
+# Hough_VERSION - The version of Hough found.
+# Hough_VERSION_MAJOR - The major version of Hough found.
+# Hough_VERSION_MINOR - The minor version of Hough found.
+# Hough_VERSION_REVISION - The revision version of Hough found.
+# Hough_VERSION_CANDIDATE - The candidate version of Hough found.
+
+message(STATUS "Found Hough- at PROJECT_VERSION@")
+set(Hough_FOUND TRUE)
+
+find_package(<dependency> REQUIRED)
+
+#set(Hough_INCLUDE_DIRS
+# "@CMAKE_INSTALL_PREFIX@/include/@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@"
+# ${<dependency>_INCLUDE_DIRS}
+# )
+#
+#set(Hough_IDL_DIRS
+# "@CMAKE_INSTALL_PREFIX@/include/@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@/idl")
+set(Hough_INCLUDE_DIRS
+ "@CMAKE_INSTALL_PREFIX@/include/@CPACK_PACKAGE_FILE_NAME@"
+ ${<dependency>_INCLUDE_DIRS}
+ )
+set(Hough_IDL_DIRS
+ "@CMAKE_INSTALL_PREFIX@/include/@CPACK_PACKAGE_FILE_NAME@/idl")
+
+
+if(WIN32)
+ set(Hough_LIBRARIES
+ "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@@PROJECT_NAME_LOWER@@CMAKE_STATIC_LIBRARY_SUFFIX@"
+ ${<dependency>_LIBRARIES}
+ )
+else(WIN32)
+ set(Hough_LIBRARIES
+ "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@@PROJECT_NAME_LOWER@@CMAKE_SHARED_LIBRARY_SUFFIX@"
+ ${<dependency>_LIBRARIES}
+ )
+endif(WIN32)
+
+set(Hough_DEFINITIONS ${<dependency>_DEFINITIONS})
+
+set(Hough_VERSION @PROJECT_VERSION@)
+set(Hough_VERSION_MAJOR @PROJECT_VERSION_MAJOR@)
+set(Hough_VERSION_MINOR @PROJECT_VERSION_MINOR@)
+set(Hough_VERSION_REVISION @PROJECT_VERSION_REVISION@)
+set(Hough_VERSION_CANDIDATE @PROJECT_VERSION_CANDIDATE@)
+
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/hough.pc.in
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/hough.pc.in (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/hough.pc.in 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +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@
+
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/uninstall_target.cmake.in
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/uninstall_target.cmake.in (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/uninstall_target.cmake.in 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +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)
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/utils.cmake
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/utils.cmake (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/utils.cmake 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +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)
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/wix.xsl.in
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/wix.xsl.in (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/cmake/wix.xsl.in 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +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="C41F309B-DC6B-4284-9C90-64127A5D18C7" Name="@CPACK_PACKAGE_NAME@ @CPACK_PACKAGE_VERSION@" Language="1041" Codepage="932" Version="@CPACK_PACKAGE_VERSION@" Manufacturer="@CPACK_PACKAGE_VENDOR@" UpgradeCode="15631B34-B7B3-4F95-86D4-28EBD72293AF">
+ <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>
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/doc/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/doc/CMakeLists.txt (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/doc/CMakeLists.txt 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +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(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)
+
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/doc/conf.py.in
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/doc/conf.py.in (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/doc/conf.py.in 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +1,216 @@
+# -*- coding: utf-8 -*-
+#
+# Hough 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)
+]
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/doc/content/index.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/doc/content/index.txt (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/doc/content/index.txt 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +1,152 @@
+HoughName - 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
+============
+
+Hough 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
+``HoughComp`` executable. The ``Hough`` library
+is available for loading into a manager, using the initialisation function
+``HoughInit``.
+
+From source
+-----------
+
+Follow these steps to install Hough from source in any operating
+system:
+
+- Download the source, either from the repository or a source archive,
+ and extract it somewhere::
+
+ tar -xvzf Hough-1.0.0.tar.gz
+
+- Change to the directory containing the extracted source::
+
+ cd Hough-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.
+
+Hough can be launched in stand-alone mode by executing the
+``HoughComp`` executable (installed into ``${prefix}/components/bin``).
+Alternatively, ``libHough.so`` can be loaded into a manager, using the
+initialisation function ``HoughInit``. 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
+================ ================== ================ ======
+canny_thresld1 int 100
+canny_thresld2 int 100
+hough_method string PROBABILISTIC
+hough_thresld int 50
+hough_param1 double 50
+hough_param2 double 10
+line_color_R int 255
+line_color_G int 0
+line_color_B int 0
+line_thickness int 2
+line_type string 8
+================ ================== ================ ======
+
+Ports
+=====
+
+The ports provided by the component are described below:
+
+=============== =========== ============================== =======
+Name Type Data type Purpose
+=============== =========== ============================== =======
+origin_image InPort RTC::CameraImage
+houghline_image OutPort RTC::CameraImage
+=============== =========== ============================== =======
+
+Examples
+========
+
+An example configuration file is provided in the
+``${prefix}/components/share/Hough/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.
+
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/doc/content/index_j.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/doc/content/index_j.txt (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/doc/content/index_j.txt 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +1,142 @@
+Hough - 日本語
+=======================
+
+
+はじめに
+========
+
+クラスについては、 `APIドキュメンテーション`_ に参照してください。
+
+.. _`APIドキュメンテーション`:
+ doxygen/html/index.html
+
+条件
+====
+
+HoughはOpenRTM-aist 1.0.0以上のC++版が必要です。
+
+Houghは CMake_ を使います。CMake 2.8以上が必要です。
+
+.. _CMAke:
+ http://www.cmake.org
+
+インストール
+============
+
+インストーラ
+------------
+
+Windowsのユーザはインストーラパッケージを使用してコンポーネントをインストール
+することができます。これはコンポーネント及びそのすべての必要なライブラリを
+インストールします。Windowsでインストールする場合、インストーラの使用を推奨してます。
+
+- インストーラをダウンロードしてください。
+- インストールを始めるためにインストーラをダブルクリックしてください。
+- 指示にしたがってコンポーネントをインストールしてください。
+- 環境変数の変更を適用するため、コンポーネントを使用する前にコンピューターを
+ 再起動する必要があるかもしれません。
+
+Houghは ``HoughComp`` の実行をダブルクリックして実行することが
+できます。あるいは、 ``Hough`` を初期化関数の ``HoughInit`` を利用して、
+マネージャにロードすることができます。
+
+ソースから
+----------
+
+ソースを使う場合は以下の手順でインストールしてください。
+
+- ソースをダウンロードして解凍してください::
+
+ tar -xvzf Hough-1.0.0.tar.gz
+
+- 解凍されたフォルダに入ってください::
+
+ cd Hough-1.0.0
+
+- ``build`` フォルダを作ってください::
+
+ mkdir build
+
+- `` build`` フォルダに入ってください::
+
+ cd build
+
+- CMakeを実行してください::
+
+ cmake ../
+
+- エラーが出無い場合、makeを実行してください::
+
+ make
+
+- ``make install`` でコンポーネントをインストールしてください。選択された
+ インストール場所に書き込み権限があるかを確認してください::
+
+ ``make install``
+
+- インストールする場所はccmakeを実行して ``CMAKE_INSTALL_PREFIX`` を
+ 設定することで変更が可能です。
+
+ ccmake ../
+
+ここまでで、コンポーネントが使えるようになりました。コンフィグレーションは次のセクションを
+参照してください。
+
+Houghは ``HoughComp`` を実行（ ``${prefix}/components/bin`` に
+インストールされます）することでスタンドアローンモードで実行することができます。
+あるいは、 ``libHough.so`` を初期化関数の ``HoughInit`` を利用して、
+マネージャにロードすることができます。このライブラリは ``${prefix}/components/lib``
+または ``${prefix}/components/lib64`` にインストールされます。
+
+
+コンフィグレーション
+====================
+
+使えるコンフィグレーションパラメータは以下のテーブルを参照
+してください。
+
+================ ================== ================ ====
+パラメータ データ型 デフォルト値 意味
+================ ================== ================ ====
+canny_thresld1 int 100
+canny_thresld2 int 100
+hough_method string PROBABILISTIC
+hough_thresld int 50
+hough_param1 double 50
+hough_param2 double 10
+line_color_R int 255
+line_color_G int 0
+line_color_B int 0
+line_thickness int 2
+line_type string 8
+================ ================== ================ ====
+
+ポート
+======
+
+コンポーネントによって提供されるポートは以下のテーブルで述べられています。
+
+=============== =========== ============================== ====
+ポート名 ポート型 データ型 意味
+=============== =========== ============================== ====
+origin_image InPort RTC::CameraImage
+houghline_image OutPort RTC::CameraImage
+=============== =========== ============================== ====
+
+例
+==
+
+例のrtc.confファイルは ``${prefix}/components/share/Hough/examples/conf/``
+フォルダにインストールされています。
+
+Changelog
+=========
+
+
+License
+=======
+
+このソフトウェアは産業技術総合研究所で開発されています。承認番号はH23PRO-????
+です。このソフトウェアは Lesser General Public License (LGPL) ライセンスとして
+公開されてます。COPYING.LESSER を参照してください。
+
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/doc/doxyfile.in
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/doc/doxyfile.in (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/doc/doxyfile.in 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +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
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/idl/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/idl/CMakeLists.txt (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/idl/CMakeLists.txt 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +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)
+
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/include/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/include/CMakeLists.txt (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/include/CMakeLists.txt 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +1,4 @@
+add_subdirectory(Hough)
+
+MAP_ADD_STR(hdrs "${PROJECT_NAME}/" headers)
+set(headers ${headers} PARENT_SCOPE)
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/include/Hough/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/include/Hough/CMakeLists.txt (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/include/Hough/CMakeLists.txt 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +1,7 @@
+set(hdrs Hough.h
+ PARENT_SCOPE
+ )
+
+install(FILES ${hdrs} DESTINATION ${INC_INSTALL_DIR}/${PROJECT_NAME_LOWER}
+ COMPONENT library)
+
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/include/Hough/Hough.h
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/include/Hough/Hough.h (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/include/Hough/Hough.h 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +1,375 @@
+// -*- C++ -*-
+/*!
+ * @file Hough.h
+ * @brief Hough line component
+ * @date $Date$
+ *
+ * $Id$
+ */
+
+#ifndef HOUGH_H
+#define HOUGH_H
+
+#include <fstream>
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+#include <rtm/idl/BasicDataTypeSkel.h>
+#include <rtm/idl/ExtendedDataTypesSkel.h>
+#include <rtm/idl/InterfaceDataTypesSkel.h>
+
+//OpenCV header file include
+#include <cv.h>
+#include <cxcore.h>
+#include <highgui.h>
+
+// cvCanny用定数
+#define APERTURE_SIZE 3 // Sobelオペレータのサイズ (リファレンス参照)
+
+// cvHoughLines2用定数
+#define RHO 1 // パラメータ空間におけるρ軸の分解能(ピクセル単位)
+#define THETA ( CV_PI / 180 ) // パラメータ空間におけるθ軸の分解能(ラジアン単位)
+
+// cvLine用定数
+#define SHIFT 0 // 座標の小数点以下の桁を表すビット数
+
+// Service implementation headers
+// <rtc-template block="service_impl_h">
+
+// </rtc-template>
+
+// Service Consumer stub headers
+// <rtc-template block="consumer_stub_h">
+
+// </rtc-template>
+
+using namespace RTC;
+
+/*!
+ * @class Hough
+ * @brief Hough line component
+ *
+ */
+class Hough
+ : public RTC::DataFlowComponentBase
+{
+ public:
+ /*!
+ * @brief constructor
+ * @param manager Maneger Object
+ */
+ Hough(RTC::Manager* manager);
+
+ /*!
+ * @brief destructor
+ */
+ ~Hough();
+
+ // <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();
+
+ /***
+ *m_image_hough
+ * The startup action when ExecutionContext startup
+ * former rtc_starting_entry()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ * #include <fstream>
+ *
+ */
+ // 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()#include <fstream>
+ *
+ * @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: canny_threshold1
+ * - DefaultValue: 100
+ */
+ int m_canny_threshold1;
+ /*!
+ *
+ * - Name: canny_threshold2
+ * - DefaultValue: 100
+ */
+ int m_canny_threshold2;
+ /*!
+ *
+ * - Name: hough_method
+ * - DefaultValue: PROBABILISTIC
+ */
+ std::string m_hough_method;
+ /*!
+ *
+ * - Name: hough_threshold
+ * - DefaultValue: 50
+ */
+ int m_hough_threshold;
+ /*!
+ *
+ * - Name: hough_param1
+ * - DefaultValue: 50
+ */
+ double m_hough_param1;
+ /*!
+ *
+ * - Name: hough_param2
+ * - DefaultValue: 10
+ */
+ double m_hough_param2;
+ /*!
+ *
+ * - Name: line_color_R
+ * - DefaultValue: 255
+ */
+ int m_line_color_R;
+ /*!
+ *
+ * - Name: line_color_G
+ * - DefaultValue: 0
+ */
+ int m_line_color_G;
+ /*!
+ *
+ * - Name: line_color_B
+ * - DefaultValue: 0
+ */
+ int m_line_color_B;
+ /*!
+ *
+ * - Name: line_thickness
+ * - DefaultValue: 2
+ */
+ int m_line_thickness;
+ /*!
+ *
+ * - Name: line_type
+ * - DefaultValue: 8
+ */
+ std::string m_line_type;
+
+ // </rtc-template>
+
+ // DataInPort declaration
+ // <rtc-template block="inport_declare">
+ RTC::CameraImage m_image_orig;
+ /*!
+ */
+ InPort<RTC::CameraImage> m_image_origIn;
+
+ // </rtc-template>
+
+
+ // DataOutPort declaration
+ // <rtc-template block="outport_declare">
+ RTC::CameraImage m_image_hough;
+ /*!
+ */
+ OutPort<RTC::CameraImage> m_image_houghOut;
+
+ // </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>
+ IplImage* imageBuff;
+ IplImage* grayImage;
+ IplImage* edgeImage;
+ IplImage* hough;
+ IplImage* houghImage;
+ int len;
+ CvSeq *lines;
+
+ int debug_method; // configuration切り替え時の確認用
+ int debug_type; // configuration切り替え時の確認用
+
+ int m_in_height; // 入力イメージのHeight
+ int m_in_width; // 入力イメージのWidth
+
+};
+
+
+extern "C"
+{
+ DLL_EXPORT void HoughInit(RTC::Manager* manager);
+};
+
+#endif // HOUGH_H
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/rtc.conf
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/rtc.conf (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/rtc.conf 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +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.Hough.config_file: Hough.conf
+# or
+# Category.Hough0.config_file: Hough0.conf
+# Category.Hough1.config_file: Hough1.conf
+# Category.Hough2.config_file: Hough2.conf
+#
+#------------------------------------------------------------
+
+Category.Hough.config_file: Hough.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
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/src/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/src/CMakeLists.txt (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/src/CMakeLists.txt 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +1,84 @@
+set(comp_srcs Hough.cpp )
+set(standalone_srcs HoughComp.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)
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/src/Hough.cpp
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/src/Hough.cpp (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/src/Hough.cpp 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +1,339 @@
+// -*- C++ -*-
+/*!
+ * @file Hough.cpp
+ * @brief Hough line component
+ * @date $Date$
+ *
+ * $Id$
+ */
+
+#include "Hough.h"
+
+// Module specification
+// <rtc-template block="module_spec">
+static const char* hough_spec[] =
+ {
+ "implementation_id", "Hough",
+ "type_name", "Hough",
+ "description", "Hough line 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.canny_thresld1", "100",
+ "conf.default.canny_thresld2", "100",
+ "conf.default.hough_method", "PROBABILISTIC",
+ "conf.default.hough_thresld", "50",
+ "conf.default.hough_param1", "50",
+ "conf.default.hough_param2", "10",
+ "conf.default.line_color_R", "255",
+ "conf.default.line_color_G", "0",
+ "conf.default.line_color_B", "0",
+ "conf.default.line_thickness", "2",
+ "conf.default.line_type", "8",
+ // Widget
+ "conf.__widget__.canny_thresld1", "slider.1",
+ "conf.__widget__.canny_thresld2", "slider.1",
+ "conf.__widget__.hough_method", "radio",
+ "conf.__widget__.hough_thresld", "slider.1",
+ "conf.__widget__.hough_param1", "text",
+ "conf.__widget__.hough_param2", "text",
+ "conf.__widget__.line_color_R", "text",
+ "conf.__widget__.line_color_G", "text",
+ "conf.__widget__.line_color_B", "text",
+ "conf.__widget__.line_thickness", "text",
+ "conf.__widget__.line_type", "radio",
+ // Constraints
+ "conf.__constraints__.canny_thresld1", "0<=x<=255",
+ "conf.__constraints__.canny_thresld2", "0<=x<=255",
+ "conf.__constraints__.hough_method", "(PROBABILISTIC,STANDARD,MULTI_SCALE)",
+ "conf.__constraints__.hough_thresld", "0<=x<=255",
+ "conf.__constraints__.line_type", "(8,4,CV_AA)",
+ ""
+ };
+// </rtc-template>
+
+/*!
+ * @brief constructor
+ * @param manager Maneger Object
+ */
+Hough::Hough(RTC::Manager* manager)
+ // <rtc-template block="initializer">
+ : RTC::DataFlowComponentBase(manager),
+ m_image_origIn("origin_image", m_image_orig),
+ m_image_houghOut("houghline_image", m_image_hough)
+
+ // </rtc-template>
+{
+}
+
+/*!
+ * @brief destructor
+ */
+Hough::~Hough()
+{
+}
+
+
+
+RTC::ReturnCode_t Hough::onInitialize()
+{
+ // Registration: InPort/OutPort/Service
+ // <rtc-template block="registration">
+ // Set InPort buffers
+ addInPort("origin_image", m_image_origIn);
+
+ // Set OutPort buffer
+ addOutPort("houghline_image", m_image_houghOut);
+
+ // 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("canny_thresld1", m_canny_threshold1, "100");
+ bindParameter("canny_thresld2", m_canny_threshold2, "100");
+ bindParameter("hough_method", m_hough_method, "PROBABILISTIC");
+ bindParameter("hough_thresld", m_hough_threshold, "50");
+ bindParameter("hough_param1", m_hough_param1, "50");
+ bindParameter("hough_param2", m_hough_param2, "10");
+ bindParameter("line_color_R", m_line_color_R, "255");
+ bindParameter("line_color_G", m_line_color_G, "0");
+ bindParameter("line_color_B", m_line_color_B, "0");
+ bindParameter("line_thickness", m_line_thickness, "2");
+ bindParameter("line_type", m_line_type, "8");
+ // </rtc-template>
+
+ return RTC::RTC_OK;
+}
+
+/*
+RTC::ReturnCode_t Hough::onFinalize()
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t Hough::onStartup(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t Hough::onShutdown(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+
+RTC::ReturnCode_t Hough::onActivated(RTC::UniqueId ec_id)
+{
+ // イメージ用メモリの初期化
+ imageBuff = NULL;
+ grayImage = NULL;
+ edgeImage = NULL;
+ hough = NULL;
+ houghImage = NULL;
+
+ m_in_height = 0;
+ m_in_width = 0;
+ lines = NULL;
+ len=0;
+
+ debug_method = -1;
+ debug_type = -1;
+
+ return RTC::RTC_OK;
+}
+
+
+RTC::ReturnCode_t Hough::onDeactivated(RTC::UniqueId ec_id)
+{
+ if(imageBuff != NULL)
+ {
+ // イメージ用メモリの解放
+ cvReleaseImage(&imageBuff);
+ cvReleaseImage(&grayImage);
+ cvReleaseImage(&edgeImage);
+ cvReleaseImage(&hough);
+ cvReleaseImage(&houghImage);
+ }
+
+ return RTC::RTC_OK;
+}
+
+
+RTC::ReturnCode_t Hough::onExecute(RTC::UniqueId ec_id)
+{
+ // 新しいデータのチェック
+ if(m_image_origIn.isNew())
+ {
+ // InPortデータの読み込み
+ m_image_origIn.read();
+
+ // サイズが変わったときだけ再生成する
+ if(m_image_orig.width != m_in_width || m_image_orig.height != m_in_height)
+ {
+ m_in_width = m_image_orig.width;
+ m_in_height = m_image_orig.height;
+
+ // InPortのイメージサイズが変更された場合
+ if(imageBuff != NULL)
+ {
+ cvReleaseImage(&imageBuff);
+ cvReleaseImage(&grayImage);
+ cvReleaseImage(&edgeImage);
+ cvReleaseImage(&hough);
+ cvReleaseImage(&houghImage);
+ }
+
+ // イメージ用メモリの確保
+ imageBuff = cvCreateImage( cvSize(m_in_width, m_in_height), IPL_DEPTH_8U, 3 );
+ grayImage = cvCreateImage( cvSize(m_in_width, m_in_height), IPL_DEPTH_8U, 1 );
+ edgeImage = cvCreateImage( cvSize(m_in_width, m_in_height), IPL_DEPTH_8U, 1 );
+ hough = cvCreateImage( cvSize(m_in_width, m_in_height), IPL_DEPTH_8U, 3 );
+ houghImage = cvCreateImage( cvSize(m_in_width, m_in_height), IPL_DEPTH_8U, 3 );
+ }
+
+ // InPortの画面データをコピー
+ memcpy( imageBuff->imageData, (void *)&(m_image_orig.pixels[0]), m_image_orig.pixels.length() );
+
+ // RGBからグレースケールに変換
+ cvCvtColor( imageBuff, grayImage, CV_RGB2GRAY );
+
+ // ハフ変換に必要なメモリ領域
+ CvMemStorage *storage = cvCreateMemStorage( 0 );
+
+ //エッジ抽出を行う
+ cvCanny( grayImage, edgeImage, m_canny_threshold1, m_canny_threshold2, APERTURE_SIZE );
+
+ //グレースケールからRGBに変換する
+ cvCvtColor( edgeImage, houghImage, CV_GRAY2RGB );
+
+ //ハフ変換により直線の抽出を行う
+ int hough_method;
+ if ( m_hough_method == "PROBABILISTIC" )
+ {
+ //確率的ハフ変換
+ hough_method = CV_HOUGH_PROBABILISTIC;
+ }
+ else if ( m_hough_method == "STANDARD" )
+ {
+ //標準的ハフ変換
+ hough_method = CV_HOUGH_STANDARD;
+ }
+ else
+ {
+ //マルチスケール型の古典的ハフ変換
+ hough_method = CV_HOUGH_MULTI_SCALE;
+ }
+ if ( hough_method != debug_method )
+ {
+ std::cout << "hough_method = " << hough_method << std::endl;
+ debug_method = hough_method;
+ }
+ lines = cvHoughLines2( edgeImage, storage, hough_method, RHO, THETA, m_hough_threshold, m_hough_param1, m_hough_param2 );
+
+ //抽出された直線を描く
+ int line_type;
+ if ( m_line_type == "CV_AA" )
+ {
+ line_type = CV_AA;
+ }
+ else
+ {
+ line_type = atoi( m_line_type.c_str() );
+ }
+ if ( line_type != debug_type )
+ {
+ std::cout << "line_type = " << line_type << std::endl;
+ debug_type = line_type;
+ }
+ for ( int i = 0; i < lines->total; i++ ) {
+ CvPoint *line = ( CvPoint* )cvGetSeqElem( lines, i );
+ cvLine( houghImage, line[0], line[1], CV_RGB( m_line_color_R, m_line_color_G, m_line_color_B ), m_line_thickness, line_type, SHIFT );
+ }
+
+ // 画像データのサイズ取得
+ len = houghImage->nChannels * houghImage->width * houghImage->height;
+ m_image_hough.pixels.length(len);
+ m_image_hough.width = houghImage->width;
+ m_image_hough.height = houghImage->height;
+
+ // 反転した画像データをOutPortにコピー
+ memcpy( (void *)&(m_image_hough.pixels[0]), houghImage->imageData, len );
+
+ // 反転した画像データをOutPortから出力
+ m_image_houghOut.write();
+
+ // ハフ変換に使用したメモリ解放
+ cvReleaseMemStorage(&storage);
+ }
+
+ return RTC::RTC_OK;
+}
+
+/*
+RTC::ReturnCode_t Hough::onAborting(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t Hough::onError(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t Hough::onReset(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t Hough::onStateUpdate(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t Hough::onRateChanged(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+
+
+extern "C"
+{
+
+ void HoughInit(RTC::Manager* manager)
+ {
+ coil::Properties profile(hough_spec);
+ manager->registerFactory(profile,
+ RTC::Create<Hough>,
+ RTC::Delete<Hough>);
+ }
+
+};
+
+
Added: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/src/HoughComp.cpp
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/src/HoughComp.cpp (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Houghline/src/HoughComp.cpp 2013-11-29 06:25:56 UTC (rev 105)
@@ -0,0 +1,97 @@
+// -*- C++ -*-
+/*!
+ * @file HoughComp.cpp
+ * @brief Standalone component
+ * @date $Date$
+ *
+ * $Id$
+ */
+
+#include <rtm/Manager.h>
+#include <iostream>
+#include <string>
+#include <stdlib.h>
+#include "Hough.h"
+
+
+void MyModuleInit(RTC::Manager* manager)
+{
+ HoughInit(manager);
+ RTC::RtcBase* comp;
+
+ // Create a component
+ comp = manager->createComponent("Hough");
+
+ 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