From 3700086fc8b1182f7f45b710d91a61f55b06a907 Mon Sep 17 00:00:00 2001 From: Antoine Date: Tue, 25 Apr 2017 16:41:04 +0200 Subject: [PATCH] =?UTF-8?q?Ajout=20du=20contr=C3=B4le=20couleur=20(A)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/CMakeCache.txt | 53 ++---------------- .../CMakeDirectoryInformation.cmake | 4 +- .../DisplayImage.dir/CXX.includecache | 48 +++++++++++++++- .../DisplayImage.dir/DependInfo.cmake | 2 +- .../DisplayImage.dir/DisplayImage.cpp.o | Bin 7496 -> 6088 bytes code/CMakeFiles/DisplayImage.dir/build.make | 14 ++--- .../DisplayImage.dir/depend.internal | 5 +- code/CMakeFiles/DisplayImage.dir/depend.make | 3 + code/CMakeFiles/Makefile.cmake | 1 + code/CMakeFiles/Makefile2 | 10 ++-- code/CMakeFiles/TargetDirectories.txt | 2 +- code/DisplayImage | Bin 14576 -> 13851 bytes code/DisplayImage.cpp | 37 ++++++++++-- code/Makefile | 8 +-- code/cmake_install.cmake | 44 +++++++++++++++ 15 files changed, 153 insertions(+), 78 deletions(-) mode change 100644 => 100755 code/DisplayImage create mode 100644 code/cmake_install.cmake diff --git a/code/CMakeCache.txt b/code/CMakeCache.txt index b0fac1c..3068e69 100644 --- a/code/CMakeCache.txt +++ b/code/CMakeCache.txt @@ -1,5 +1,5 @@ # This is the CMakeCache file. -# For build in directory: /home/sasl/eleves/rob/3408017/projet_info +# For build in directory: /home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code # It was generated by CMake: /usr/bin/cmake # You can edit this file to change values found and used by cmake. # If you do not want to change any of the values, simply exit the editor. @@ -14,9 +14,6 @@ # EXTERNAL cache entries ######################## -//Path to a program. -CMAKE_AR:FILEPATH=/usr/bin/ar - //Choose the type of build, options are: None(CMAKE_CXX_FLAGS or // CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel. CMAKE_BUILD_TYPE:STRING= @@ -85,9 +82,6 @@ CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=OFF //Install path prefix, prepended onto install directories. CMAKE_INSTALL_PREFIX:PATH=/usr/local -//Path to a program. -CMAKE_LINKER:FILEPATH=/usr/bin/ld - //Path to a program. CMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/make @@ -106,21 +100,9 @@ CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING= -//Path to a program. -CMAKE_NM:FILEPATH=/usr/bin/nm - -//Path to a program. -CMAKE_OBJCOPY:FILEPATH=/usr/bin/objcopy - -//Path to a program. -CMAKE_OBJDUMP:FILEPATH=/usr/bin/objdump - //Value Computed by CMake CMAKE_PROJECT_NAME:STATIC=DisplayImage -//Path to a program. -CMAKE_RANLIB:FILEPATH=/usr/bin/ranlib - //Flags used by the linker during the creation of dll's. CMAKE_SHARED_LINKER_FLAGS:STRING=' ' @@ -158,9 +140,6 @@ CMAKE_STATIC_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO:STRING= -//Path to a program. -CMAKE_STRIP:FILEPATH=/usr/bin/strip - //If true, cmake will use relative paths in makefiles and projects. CMAKE_USE_RELATIVE_PATHS:BOOL=OFF @@ -171,10 +150,10 @@ CMAKE_USE_RELATIVE_PATHS:BOOL=OFF CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE //Value Computed by CMake -DisplayImage_BINARY_DIR:STATIC=/home/sasl/eleves/rob/3408017/projet_info +DisplayImage_BINARY_DIR:STATIC=/home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code //Value Computed by CMake -DisplayImage_SOURCE_DIR:STATIC=/home/sasl/eleves/rob/3408017/projet_info +DisplayImage_SOURCE_DIR:STATIC=/home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code //Path where debug 3rdpaty OpenCV dependencies are located OpenCV_3RDPARTY_LIB_DIR_DBG:PATH= @@ -198,14 +177,12 @@ OpenCV_LIB_DIR_OPT:PATH= # INTERNAL cache entries ######################## -//ADVANCED property for variable: CMAKE_AR -CMAKE_AR-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_BUILD_TOOL CMAKE_BUILD_TOOL-ADVANCED:INTERNAL=1 //What is the target build tool cmake is generating for. CMAKE_BUILD_TOOL:INTERNAL=/usr/bin/make //This is the directory where this CMakeCache.txt was created -CMAKE_CACHEFILE_DIR:INTERNAL=/home/sasl/eleves/rob/3408017/projet_info +CMAKE_CACHEFILE_DIR:INTERNAL=/home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code //Major version of cmake used to create the current loaded cache CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2 //Minor version of cmake used to create the current loaded cache @@ -220,8 +197,6 @@ CMAKE_COMMAND:INTERNAL=/usr/bin/cmake CMAKE_CPACK_COMMAND:INTERNAL=/usr/bin/cpack //Path to ctest program executable. CMAKE_CTEST_COMMAND:INTERNAL=/usr/bin/ctest -//ADVANCED property for variable: CMAKE_CXX_COMPILER -CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_CXX_FLAGS_DEBUG @@ -232,8 +207,6 @@ CMAKE_CXX_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 CMAKE_CXX_FLAGS_RELEASE-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_CXX_FLAGS_RELWITHDEBINFO CMAKE_CXX_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_C_COMPILER -CMAKE_C_COMPILER-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_C_FLAGS CMAKE_C_FLAGS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_C_FLAGS_DEBUG @@ -244,8 +217,6 @@ CMAKE_C_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 CMAKE_C_FLAGS_RELEASE-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_C_FLAGS_RELWITHDEBINFO CMAKE_C_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 -//Executable file format -CMAKE_EXECUTABLE_FORMAT:INTERNAL=ELF //ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS CMAKE_EXE_LINKER_FLAGS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_DEBUG @@ -264,11 +235,9 @@ CMAKE_GENERATOR:INTERNAL=Unix Makefiles CMAKE_GENERATOR_TOOLSET:INTERNAL= //Start directory with the top level CMakeLists.txt file for this // project -CMAKE_HOME_DIRECTORY:INTERNAL=/home/sasl/eleves/rob/3408017/projet_info +CMAKE_HOME_DIRECTORY:INTERNAL=/home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code //Install .so files without execute permission. CMAKE_INSTALL_SO_NO_EXE:INTERNAL=1 -//ADVANCED property for variable: CMAKE_LINKER -CMAKE_LINKER-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_MAKE_PROGRAM CMAKE_MAKE_PROGRAM-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS @@ -281,16 +250,8 @@ CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 CMAKE_MODULE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_NM -CMAKE_NM-ADVANCED:INTERNAL=1 //number of local generators CMAKE_NUMBER_OF_LOCAL_GENERATORS:INTERNAL=1 -//ADVANCED property for variable: CMAKE_OBJCOPY -CMAKE_OBJCOPY-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_OBJDUMP -CMAKE_OBJDUMP-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_RANLIB -CMAKE_RANLIB-ADVANCED:INTERNAL=1 //Path to CMake installation. CMAKE_ROOT:INTERNAL=/usr/share/cmake-2.8 //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS @@ -317,10 +278,6 @@ CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 CMAKE_STATIC_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_STRIP -CMAKE_STRIP-ADVANCED:INTERNAL=1 -//uname command -CMAKE_UNAME:INTERNAL=/bin/uname //ADVANCED property for variable: CMAKE_USE_RELATIVE_PATHS CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE diff --git a/code/CMakeFiles/CMakeDirectoryInformation.cmake b/code/CMakeFiles/CMakeDirectoryInformation.cmake index ab66ac1..0610c48 100644 --- a/code/CMakeFiles/CMakeDirectoryInformation.cmake +++ b/code/CMakeFiles/CMakeDirectoryInformation.cmake @@ -2,8 +2,8 @@ # Generated by "Unix Makefiles" Generator, CMake Version 2.8 # Relative path conversion top directories. -SET(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/sasl/eleves/rob/3408017/projet_info") -SET(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/sasl/eleves/rob/3408017/projet_info") +SET(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code") +SET(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code") # Force unix paths in dependencies. SET(CMAKE_FORCE_UNIX_PATHS 1) diff --git a/code/CMakeFiles/DisplayImage.dir/CXX.includecache b/code/CMakeFiles/DisplayImage.dir/CXX.includecache index 3718ff0..ef5549e 100644 --- a/code/CMakeFiles/DisplayImage.dir/CXX.includecache +++ b/code/CMakeFiles/DisplayImage.dir/CXX.includecache @@ -6,9 +6,51 @@ #IncludeRegexTransform: -/home/sasl/eleves/rob/3408017/projet_info/DisplayImage.cpp -stdio.h +/home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code/DisplayImage.cpp +cv.h - -opencv2/opencv.hpp +highgui.h +- +cxcore.h - +/usr/include/opencv/cv.h +opencv2/core/core_c.h +/usr/include/opencv/opencv2/core/core_c.h +opencv2/core/core.hpp +/usr/include/opencv/opencv2/core/core.hpp +opencv2/imgproc/imgproc_c.h +/usr/include/opencv/opencv2/imgproc/imgproc_c.h +opencv2/imgproc/imgproc.hpp +/usr/include/opencv/opencv2/imgproc/imgproc.hpp +opencv2/video/tracking.hpp +/usr/include/opencv/opencv2/video/tracking.hpp +opencv2/features2d/features2d.hpp +/usr/include/opencv/opencv2/features2d/features2d.hpp +opencv2/flann/flann.hpp +/usr/include/opencv/opencv2/flann/flann.hpp +opencv2/calib3d/calib3d.hpp +/usr/include/opencv/opencv2/calib3d/calib3d.hpp +opencv2/objdetect/objdetect.hpp +/usr/include/opencv/opencv2/objdetect/objdetect.hpp +opencv2/legacy/compat.hpp +/usr/include/opencv/opencv2/legacy/compat.hpp +opencv2/core/internal.hpp +/usr/include/opencv/opencv2/core/internal.hpp + +/usr/include/opencv/cxcore.h +opencv2/core/core_c.h +/usr/include/opencv/opencv2/core/core_c.h +opencv2/core/core.hpp +/usr/include/opencv/opencv2/core/core.hpp + +/usr/include/opencv/highgui.h +opencv2/core/core_c.h +/usr/include/opencv/opencv2/core/core_c.h +opencv2/core/core.hpp +/usr/include/opencv/opencv2/core/core.hpp +opencv2/highgui/highgui_c.h +/usr/include/opencv/opencv2/highgui/highgui_c.h +opencv2/highgui/highgui.hpp +/usr/include/opencv/opencv2/highgui/highgui.hpp + diff --git a/code/CMakeFiles/DisplayImage.dir/DependInfo.cmake b/code/CMakeFiles/DisplayImage.dir/DependInfo.cmake index 94e3229..8ff4c12 100644 --- a/code/CMakeFiles/DisplayImage.dir/DependInfo.cmake +++ b/code/CMakeFiles/DisplayImage.dir/DependInfo.cmake @@ -4,7 +4,7 @@ SET(CMAKE_DEPENDS_LANGUAGES ) # The set of files for implicit dependencies of each language: SET(CMAKE_DEPENDS_CHECK_CXX - "/home/sasl/eleves/rob/3408017/projet_info/DisplayImage.cpp" "/home/sasl/eleves/rob/3408017/projet_info/CMakeFiles/DisplayImage.dir/DisplayImage.cpp.o" + "/home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code/DisplayImage.cpp" "/home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code/CMakeFiles/DisplayImage.dir/DisplayImage.cpp.o" ) SET(CMAKE_CXX_COMPILER_ID "GNU") diff --git a/code/CMakeFiles/DisplayImage.dir/DisplayImage.cpp.o b/code/CMakeFiles/DisplayImage.dir/DisplayImage.cpp.o index 2224fe555c552df3cb4868714f953165958be9d2..937674c671ffe30e1d66034fdd6f6b308ba622ae 100644 GIT binary patch literal 6088 zcmbtXZEPIH8J_cnkcNOAXd&e*2ThAx$jU};Yf?TOpO>tgb8PN#EKI_(zFYfNocGM$ zo<9Nxqr@nyYbv)O5VVy7KT!GyQB|$nv`tK@2>gK{XcV=o8VOZ$RR1s^5^fb?-gkCh z-*|jWkoroy^UgER`^?Ncvo~{3>ZyC{VlhS*V|TM^jZnsx)>r*D?zXY3SOe!?3U!Rx z08g(G{5zPuUACWDqjE`z zy?%TPI44lEO6B}nh+aPbqc}ujRB(z^jw$RfuR`##O51ILekk-B1O0I5Jsjvisq`MI z=!b(dRrMKYoH-7?vJ*H-so&Rl3yxH6nN@~xYPtYpuK@GZ^ayyr<(>~-6Zgi!Tjt*5 z;MnNtQwSJGc;wDm@Yx?Q%n1H+0xQ+z00%WM#=+hMhb!08!Es!SgCo2MN1ys~g0g(Z z!O3H+-1rr?!1*nZZKKkKnLl>Ck*DJwT9JxA^>O|8PFJRJ7T~>A;dudX&N!ma4c7Pl zV}&}6vk2LkmynHXB-rOxkALyUL+~{W@m|Xg}ezU#^udaD`^`3**{v zop2##?T|4JLmJy5Y21h0wr`mM?$Z7@7}L|~?(~jC)*A84o}F+?i9NlkRAM7bTEn(y zF(b2=wL7lmcs5HGUEeDfSgJT?FvA(j8|Y@Zn?ZLkclVO$pa&W#>6QxxP182A;fXQF z%@xNO{Nf2qkR!@n$>feiWA8xO^~;GCtyTN}_S?(6*8D_si`LYlHGen6dBE32SnNQW z#l{82?MreixS1K3{|m+`d(P($@A=jrTO-_ z&$OK7TTB}$l^6#!v;PO#(TsDzcAOQY6_Bh|u)G`?)4XCB#8n*E@lDI~tO=%Ni^IdV z3!-k(x3yh+dbgK+EBgpUV1IVrd8_qu_>B#elGt9zjy9ugw zFrrsPa`+hp*nRNCfIlwil+V1trxYCPsPm!F;b)cL#Q7H?DpC<={KS-y(2esQv<3$C zO>03w;%jz0>8#x`FGJJKQas5}^EX7$57~aONgdWIf#P125>ild6>g=>{C^R69V}=q{rU*}h6w!D2>i|nd{+dXj=&#^!1EFKL#N{9+Ed-h-2&g0>Tchef*#5PW~XWP zH#dW@@42%YUJ7j0T&E$(? z6w+ro{%(5$(6n8!tr850|APRa12b2g5Pd=3GJdO5ESUqqYUzYbC!2MczL_f(%{-*K zU}F|lQb$P2j$0;7cpO%Y+pS^2&kQ`GF2KJgw0k5R&nCk0_YO@yyRp6(UtqY^z6lTU zA4Cug@oV8B{80qK5XU{;vd1{B5HC zas>Zf3CHu2`aLhtPu{j~}cL<#FL*L^)68|QNzgyv>7FtgPf1kpq@6n3jKO*5bgD%Z$ zIs*ThgnvuoKPPaSmy3f0`-Q~Ev5@{>CH^|j3}0_c{BKMAcO*XkCnbAd!et%0m*aSD zAu^Qzl=K^+PU9g8Zg*TWx=$uV17h;+xlO{wUkQ#pEa4bKHYFUy@S*$LQ3a>_@SK9v Gc)kF_4KvsP literal 7496 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 CMakeFiles/DisplayImage.dir/DisplayImage.cpp.i + /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -E /home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code/DisplayImage.cpp > CMakeFiles/DisplayImage.dir/DisplayImage.cpp.i CMakeFiles/DisplayImage.dir/DisplayImage.cpp.s: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/DisplayImage.dir/DisplayImage.cpp.s" - /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -S /home/sasl/eleves/rob/3408017/projet_info/DisplayImage.cpp -o CMakeFiles/DisplayImage.dir/DisplayImage.cpp.s + /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -S /home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code/DisplayImage.cpp -o CMakeFiles/DisplayImage.dir/DisplayImage.cpp.s CMakeFiles/DisplayImage.dir/DisplayImage.cpp.o.requires: .PHONY : CMakeFiles/DisplayImage.dir/DisplayImage.cpp.o.requires @@ -126,6 +126,6 @@ CMakeFiles/DisplayImage.dir/clean: .PHONY : CMakeFiles/DisplayImage.dir/clean CMakeFiles/DisplayImage.dir/depend: - cd /home/sasl/eleves/rob/3408017/projet_info && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/sasl/eleves/rob/3408017/projet_info /home/sasl/eleves/rob/3408017/projet_info /home/sasl/eleves/rob/3408017/projet_info /home/sasl/eleves/rob/3408017/projet_info /home/sasl/eleves/rob/3408017/projet_info/CMakeFiles/DisplayImage.dir/DependInfo.cmake --color=$(COLOR) + cd /home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code /home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code /home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code /home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code /home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code/CMakeFiles/DisplayImage.dir/DependInfo.cmake --color=$(COLOR) .PHONY : CMakeFiles/DisplayImage.dir/depend diff --git a/code/CMakeFiles/DisplayImage.dir/depend.internal b/code/CMakeFiles/DisplayImage.dir/depend.internal index 44d930f..49b11ce 100644 --- a/code/CMakeFiles/DisplayImage.dir/depend.internal +++ b/code/CMakeFiles/DisplayImage.dir/depend.internal @@ -2,4 +2,7 @@ # Generated by "Unix Makefiles" Generator, CMake Version 2.8 CMakeFiles/DisplayImage.dir/DisplayImage.cpp.o - /home/sasl/eleves/rob/3408017/projet_info/DisplayImage.cpp + /home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code/DisplayImage.cpp + /usr/include/opencv/cv.h + /usr/include/opencv/cxcore.h + /usr/include/opencv/highgui.h diff --git a/code/CMakeFiles/DisplayImage.dir/depend.make b/code/CMakeFiles/DisplayImage.dir/depend.make index d371998..a7d878e 100644 --- a/code/CMakeFiles/DisplayImage.dir/depend.make +++ b/code/CMakeFiles/DisplayImage.dir/depend.make @@ -2,4 +2,7 @@ # Generated by "Unix Makefiles" Generator, CMake Version 2.8 CMakeFiles/DisplayImage.dir/DisplayImage.cpp.o: DisplayImage.cpp +CMakeFiles/DisplayImage.dir/DisplayImage.cpp.o: /usr/include/opencv/cv.h +CMakeFiles/DisplayImage.dir/DisplayImage.cpp.o: /usr/include/opencv/cxcore.h +CMakeFiles/DisplayImage.dir/DisplayImage.cpp.o: /usr/include/opencv/highgui.h diff --git a/code/CMakeFiles/Makefile.cmake b/code/CMakeFiles/Makefile.cmake index 2d5284e..992ab2d 100644 --- a/code/CMakeFiles/Makefile.cmake +++ b/code/CMakeFiles/Makefile.cmake @@ -20,6 +20,7 @@ SET(CMAKE_MAKEFILE_DEPENDS "/usr/share/cmake-2.8/Modules/CMakeCommonLanguageInclude.cmake" "/usr/share/cmake-2.8/Modules/CMakeGenericSystem.cmake" "/usr/share/cmake-2.8/Modules/CMakeSystemSpecificInformation.cmake" + "/usr/share/cmake-2.8/Modules/CMakeUnixFindMake.cmake" "/usr/share/cmake-2.8/Modules/Compiler/GNU-C.cmake" "/usr/share/cmake-2.8/Modules/Compiler/GNU-CXX.cmake" "/usr/share/cmake-2.8/Modules/Compiler/GNU.cmake" diff --git a/code/CMakeFiles/Makefile2 b/code/CMakeFiles/Makefile2 index 3a824e4..a6dba77 100644 --- a/code/CMakeFiles/Makefile2 +++ b/code/CMakeFiles/Makefile2 @@ -47,10 +47,10 @@ RM = /usr/bin/cmake -E remove -f EQUALS = = # The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /home/sasl/eleves/rob/3408017/projet_info +CMAKE_SOURCE_DIR = /home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code # The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /home/sasl/eleves/rob/3408017/projet_info +CMAKE_BINARY_DIR = /home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code #============================================================================= # Target rules for target CMakeFiles/DisplayImage.dir @@ -59,7 +59,7 @@ CMAKE_BINARY_DIR = /home/sasl/eleves/rob/3408017/projet_info CMakeFiles/DisplayImage.dir/all: $(MAKE) -f CMakeFiles/DisplayImage.dir/build.make CMakeFiles/DisplayImage.dir/depend $(MAKE) -f CMakeFiles/DisplayImage.dir/build.make CMakeFiles/DisplayImage.dir/build - $(CMAKE_COMMAND) -E cmake_progress_report /home/sasl/eleves/rob/3408017/projet_info/CMakeFiles 1 + $(CMAKE_COMMAND) -E cmake_progress_report /home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code/CMakeFiles 1 @echo "Built target DisplayImage" .PHONY : CMakeFiles/DisplayImage.dir/all @@ -69,9 +69,9 @@ all: CMakeFiles/DisplayImage.dir/all # Build rule for subdir invocation for target. CMakeFiles/DisplayImage.dir/rule: cmake_check_build_system - $(CMAKE_COMMAND) -E cmake_progress_start /home/sasl/eleves/rob/3408017/projet_info/CMakeFiles 1 + $(CMAKE_COMMAND) -E cmake_progress_start /home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code/CMakeFiles 1 $(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/DisplayImage.dir/all - $(CMAKE_COMMAND) -E cmake_progress_start /home/sasl/eleves/rob/3408017/projet_info/CMakeFiles 0 + $(CMAKE_COMMAND) -E cmake_progress_start /home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code/CMakeFiles 0 .PHONY : CMakeFiles/DisplayImage.dir/rule # Convenience name for target. diff --git a/code/CMakeFiles/TargetDirectories.txt b/code/CMakeFiles/TargetDirectories.txt index 0e929e9..d905414 100644 --- a/code/CMakeFiles/TargetDirectories.txt +++ b/code/CMakeFiles/TargetDirectories.txt @@ -1 +1 @@ -/home/sasl/eleves/rob/3408017/projet_info/CMakeFiles/DisplayImage.dir +/home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code/CMakeFiles/DisplayImage.dir diff --git a/code/DisplayImage b/code/DisplayImage old mode 100644 new mode 100755 index f5d6af47a408769e6e47bc77a2610a7bea1beeeb..d1abd8a579f5e866a65bfd5fd7e5e3789965cedf GIT binary patch literal 13851 zcmeHNeQ;CPmA|%tIDloFKplZAZd1~M?&UZi0U;` zR9L;ZUUDX6{g5k2$uxNj_P{uPoxOiEg7b>svd$WCX-9v2`0OgvP&sDrj^Q$DYuW>MpviG z?=1B|BH2SkG|PLIk}jpTw~SumyKj&ps7EqPcbTwY%64Cb9o6#>O_fTqU6og?U$Wz4 z8t^!LE*$FFT=%(f@5XQ_k{I4NT)%na<~nyg>fR*VP5w#u{;gfoko&P364iM*F6wH^ z@BD3Y*QM>REj)01vcBn?U%0w3TK0=7-{ zo#UH?dvUplv88XIQ(_Q{3hToT=uj9fXfa-ehpV4|35B*&lbUHsVL;f zSp+{)1pj^!|M4RD-xl%HR|J0ueq6Zh=_LS#>R(sH&-aSplM*i%7t1}eh^N)M@tVY) z;<;reE;Dhv4HJ2pSR#%s$;F?8ekEq_q^p}%C7n_DIU8OJKUJba%qai-{J$mjtHp#( z|ECJK`~ME`DoeRMk+%Y;{;5>!KUeByiIE?}M?&o? z<5RL9%0-*<6IA%S%FnM=f0ir!zks{&gxlM-Q2BpZ`R9E?U|ot11tWnydT6kJC>9OK zHOXBkbiIEt8qwp1KW6B<&>z^Nw+H(}aU&RO3j5>nU|i@eovnIrFs9(n)~0YY672N% zgo9>Y!JNRJraeYeG#rgt3Lgmd5A-KOTsU-MLBA1f8T9uDMPScX|6s6pM<~)8-3!Ug zYXTPYH~EK*M2vKH_(R5n!4YsB1JS)~Y3g>y{DH@M{4r#<2g5;sJealnVj>tD*%E^{ zZGm)WY8aq2tC;A zH~h%xiN{SGP^6bN1M!637m9=+lOAh4Tw9BAHB^s;+NgS)(P^Q5!4PyGt_L6RhyAf$ zB&#pDGBB>&;HWng(G&4tuejgW(%7_fr+zzTjO6uA?oIAHTZHF=PxPX#?LvO zk<^hzW>u?of%Z~sJ6smrAvMk0dJE2L4CT~Va4LgSy#-&zAgITJQ`wv}3(ji~<+WLG zG&qxXTJXggRETa1zQlqLSn#D5e8__H8bjH`7TjskKWM=#Ecg)%PGiVv+=5&8nPV3G z237_=Zo%nH#7P^yT&9gJ>{{*;+Tm$qVX6Z;+URp-XIR6e^LI2tWqw^V?iH&&;7A^z z%=CqMq;+?bjF}|TGg96}GEIT>w3Kfp*+KFNDX$@!hCF>-$~TcrL!BO%@-mX?sF^+} z<;5h^(58o^TuL$xX}Vj=AKU<$hBDnI<#$P@AxwLue34`tx^#_{UniM{EbWr=f09f? zm9CWXizL$!rG=FLnPeK8^z6p~);&uy4N3ZfluwdO$I0{zZN8b~NqmY1)vqvu9~PPyGe_T|z#QLY_9MIR2&uXVH-lvt!Xuq6G!1yF7YKLDmuI|>7&zttIEBk}@ zZa{rSqN)p)sRO9U?&lZY2&m*YXJ~x2(R4)wucMNZ-f?7(p9C*X(KOSL z^J%l(6EcTtn#oye=1iJZSb%?1sU)DYhr_7*7&Olw9s>7c$r<2kBsUChUUH9vp+m}9 z??D2zqtdcL_WmoJM=78T3rbse9Z6P7oj`?^jJ=k^nh<4*-~= zwJi122lMmq&zw%JJ~VBVURs!@hs1oc_8|w&Jx)dZ9Q@Q4>cKa`$vO0b`CyJ-uEdj? zOw5h$|F9(SnJ?|1qxqLuHFX;6Noo6q<41An@W1GqHVkkB=^s~TT$hm#jQ1kTh|5LcAwYAy5>krOO`4YUDk*m zlQ6om5uGM^^lfAHICSTBpXqZ~tUiRo1vVhju%jV4->|(U`Cda;OY-H0PT$dW-Ai0p z5|3^i0PXN?c&qkR?es?u+Tl_w{s*0N_#I;vyYMA1`jYQ8!^iycUumOfO0>H!B`(s& z_ourXb~Ws7c%(r;)0ZvsH)k;aXs=XTV~IN5c-z~zwcqUun5Su1DDK+Y<@31~3-gpM zw2tkfF%!F4!hm%#bR(| zuX&c2=Q-IIE_oLvD;@XHyBeA#-5Ape&~Y?+7<4~IuoA=em!LJEw_wh+fp&uqfhIs_ zp!YS)h%pBYN_wTqJB%952!uPYlbxvr9M`cG7evTh|sl?v+%u@?EH zf8u?!F2Y&4#aaD8#ge^c2gQ9i-E-^hYuAtq(!sVUzJo=Sc+udje6qBue9;aR43V&2 zTu&pv9W;|)+A0+&pC(HX^^)f=w%4-u-$Q;o@}G8C>>W=zNQ3O3!}Tv%U+5i6#{Y2E z{!PFs9~?5h?_bt=FtO6f%8`>hGlw3Nr~kHis5%^{5^x;rSW$U`W{D# zzpwJQxk?ij^!(N8P7SfH72J2q}gNU8QfZJoQO z&Rx5~#6_NJon7^IQ?*VAcYI{f@b`ckF_R837mDCZ(U5RQqDIi&(Acuk@b@dJKaz0w zBtrNY9_kftk_P!7P>zc^N*Mo%s(1{8oc`lLje>Wg+tujvJ}%JKDh{Y zAUZf0j2QOL{v%|1-sw@|`CVV?fs~E+;OAX}xT(jEMR5x_ddAqkv(y7A8&BbqQuekW z%Sx^mcdNZo>XEpi9Ilm8_GY(lM%H_HCb@iGhmI+L{>M||Zy@~qo2U?5!7RbW_PkDc z)WS2aD6M1EcDCpBVmmNWVS8TpX4JyR>l{>MviIL3KxvI(dtO)8tA)v@?704{$MiAe z)0)LHuUo^)-lOcPI;6w(SFqRzhWeE4d7Ye8_PkDV`E1YaKV-A#bvLE#d7UPE+KcS= zUjasa!utg8Q^#mfka+(wC9|%~6HVf>+D|X>5GRaFMk?pPF(6S$($oNPKo>3^p+iemVXAO!eY*z`MJ}Jduu!`22ipG{x-|FLp7&XfBjb26o}XMkx9e@#TFd9}y>qLPfyDZz zl$9C3gbb^_aCMuiE|W}{By(pwrdN?;wVzP-6E4$)>&Xt-j^z))5XSAN&tjA&U6N$q zlbT{)d+9G8eDHI_9xLl6N3-ivRCeGacfF%>SHRd^y&WZYv~t2mY<_ zdST6Uh#Lj31GzZ<(S+gJ(Sg4^p)|NBZ2 z_vI@0N&02#m`5d#Pj>}sPe=AgCWZFH0~t@#$^(Cp?19> z^*x{$Jk`&)O_G|V70<`+VDGplOO({F27O054EpQeIAm2 zszlog4>Yo=U*h@wPa1{%#HD_9CO(KgJwXMde|UdnoW3&=ZlBM8E&b%rw`U}tKX0Fv zc(tI9m)7(P;LFet_V~$vQ#hZO*ydH>E*32GeW{=STz{neP;>_+UdzkDs3VZX`L?DA z{#oFa1>z6yl6ZdHrniWn4yAw2)(>=!cX1^wv|suu7xs9_eZVQM(jNEtr1YOZzDI!< ziu3#{<;NbM`S-vJ)#smpQ@_!tXKT8sa4Saq?~346jw1ap@%*^ZO-1zYD}ry6c>aFT zRYX5p1m9l-KT-t$A@D+Rsy`~C|L;=Y-fKc!DWd;T5xflNh(h!EX5fY5ghe1`#Ek^L zpa&2N`9M>{T}g^#BFF#s$Z_S|G$;M)m%1w8tOTdyQx;uKN?i0xu4R z!a*b0>)w3VowrkfX1uPn12sJ_hX&v&1L;D~hG}IsIMN}`|<0Jx7u90D(Tkj0) z=?nWK5nug|ZSBn+Ef0IW6xf=9?`rgIYkE-O_xrXrHuz9NqDODh^#U=c`j+;FRr zQORc5tg`!k(aS1sRz}=r;%HS|uE%4Ibj=1H=Z4u@f^s=x*^Eh6A-cKI)df1p8kB1W z`kL{;xy9$j>lTXBE*zGu9I5DCuB0VYx^SGeEr42uB~vHKnHAXcdjhIW6>G3_Zfo)) uy*W}mFZemvE+@V@F9w@pt#cbIBiH$9&52vjjULYgdYduWxrN$7q5l_eDH>J) literal 14576 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 @@ -39,9 +40,31 @@ int main(int argc, char* argv[]) // Initialize different images that are going to be used in the program IplImage* hsv_frame = cvCreateImage(size, IPL_DEPTH_8U, 3); // image converted to HSV plane - IplImage* thresholded = cvCreateImage(size, IPL_DEPTH_8U, 1); + IplImage* threshold = cvCreateImage(size, IPL_DEPTH_8U, 1); - + //Controle couleur + cvNamedWindow("Control", CV_WINDOW_AUTOSIZE); //create a window called "Control" + + //Setup Kirby + int iLowH = 139; + int iHighH = 179; + + int iLowS = 48; + int iHighS = 255; + + int iLowV = 101; + int iHighV = 255; + + //Create trackbars in "Control" window + cvCreateTrackbar("LowH", "Control", &iLowH, 179); //Hue (0 - 179) + cvCreateTrackbar("HighH", "Control", &iHighH, 179); + + cvCreateTrackbar("LowS", "Control", &iLowS, 255); //Saturation (0 - 255) + cvCreateTrackbar("HighS", "Control", &iHighS, 255); + + cvCreateTrackbar("LowV", "Control", &iLowV, 255); //Value (0 - 255) + cvCreateTrackbar("HighV", "Control", &iHighV, 255); + while( 1 ) { @@ -58,15 +81,17 @@ int main(int argc, char* argv[]) // Covert color space to HSV as it is much easier to filter colors in the HSV color-space. cvCvtColor(frame, hsv_frame, CV_BGR2HSV); - cvInRangeS(frame, cvScalar(255, 100, 230), cvScalar(255, 200, 255), thresholded); + cvInRangeS(hsv_frame, cvScalar(iLowH, iLowS, iLowV), cvScalar(iHighH, iHighS, iHighV), threshold); cvShowImage( "Camera", frame ); // Original stream with detected ball overlay cvShowImage( "HSV", hsv_frame); // Original stream in the HSV color space - cvShowImage( "After Color Filtering", thresholded ); // The stream after color filtering + cvShowImage( "Binaire", threshold); // The stream after color filtering - if( (cvWaitKey(10) ) >= 0 ) break; + if( (cvWaitKey(10) ) >= 0 ) break; //Arret capture } - + + cvWaitKey(0); //Fin programme + // Release the capture device housekeeping cvReleaseCapture( &capture ); cvDestroyWindow( "mywindow" ); diff --git a/code/Makefile b/code/Makefile index 2b227da..ea432cd 100644 --- a/code/Makefile +++ b/code/Makefile @@ -39,10 +39,10 @@ RM = /usr/bin/cmake -E remove -f EQUALS = = # The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /home/sasl/eleves/rob/3408017/projet_info +CMAKE_SOURCE_DIR = /home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code # The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /home/sasl/eleves/rob/3408017/projet_info +CMAKE_BINARY_DIR = /home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code #============================================================================= # Targets provided globally by CMake. @@ -69,9 +69,9 @@ rebuild_cache/fast: rebuild_cache # The main all target all: cmake_check_build_system - $(CMAKE_COMMAND) -E cmake_progress_start /home/sasl/eleves/rob/3408017/projet_info/CMakeFiles /home/sasl/eleves/rob/3408017/projet_info/CMakeFiles/progress.marks + $(CMAKE_COMMAND) -E cmake_progress_start /home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code/CMakeFiles /home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code/CMakeFiles/progress.marks $(MAKE) -f CMakeFiles/Makefile2 all - $(CMAKE_COMMAND) -E cmake_progress_start /home/sasl/eleves/rob/3408017/projet_info/CMakeFiles 0 + $(CMAKE_COMMAND) -E cmake_progress_start /home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code/CMakeFiles 0 .PHONY : all # The main clean target diff --git a/code/cmake_install.cmake b/code/cmake_install.cmake new file mode 100644 index 0000000..05da2fd --- /dev/null +++ b/code/cmake_install.cmake @@ -0,0 +1,44 @@ +# Install script for directory: /home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code + +# Set the install prefix +IF(NOT DEFINED CMAKE_INSTALL_PREFIX) + SET(CMAKE_INSTALL_PREFIX "/usr/local") +ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) +STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") + +# Set the install configuration name. +IF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) + IF(BUILD_TYPE) + STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" "" + CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") + ELSE(BUILD_TYPE) + SET(CMAKE_INSTALL_CONFIG_NAME "") + ENDIF(BUILD_TYPE) + MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") +ENDIF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) + +# Set the component getting installed. +IF(NOT CMAKE_INSTALL_COMPONENT) + IF(COMPONENT) + MESSAGE(STATUS "Install component: \"${COMPONENT}\"") + SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}") + ELSE(COMPONENT) + SET(CMAKE_INSTALL_COMPONENT) + ENDIF(COMPONENT) +ENDIF(NOT CMAKE_INSTALL_COMPONENT) + +# Install shared libraries without execute permission? +IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) + SET(CMAKE_INSTALL_SO_NO_EXE "1") +ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) + +IF(CMAKE_INSTALL_COMPONENT) + SET(CMAKE_INSTALL_MANIFEST "install_manifest_${CMAKE_INSTALL_COMPONENT}.txt") +ELSE(CMAKE_INSTALL_COMPONENT) + SET(CMAKE_INSTALL_MANIFEST "install_manifest.txt") +ENDIF(CMAKE_INSTALL_COMPONENT) + +FILE(WRITE "/home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code/${CMAKE_INSTALL_MANIFEST}" "") +FOREACH(file ${CMAKE_INSTALL_MANIFEST_FILES}) + FILE(APPEND "/home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code/${CMAKE_INSTALL_MANIFEST}" "${file}\n") +ENDFOREACH(file)