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 2224fe5..937674c 100644 Binary files a/code/CMakeFiles/DisplayImage.dir/DisplayImage.cpp.o and b/code/CMakeFiles/DisplayImage.dir/DisplayImage.cpp.o differ diff --git a/code/CMakeFiles/DisplayImage.dir/build.make b/code/CMakeFiles/DisplayImage.dir/build.make index 7c0bccc..b0a3655 100644 --- a/code/CMakeFiles/DisplayImage.dir/build.make +++ b/code/CMakeFiles/DisplayImage.dir/build.make @@ -35,10 +35,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 # Include any dependencies generated for this target. include CMakeFiles/DisplayImage.dir/depend.make @@ -51,17 +51,17 @@ include CMakeFiles/DisplayImage.dir/flags.make CMakeFiles/DisplayImage.dir/DisplayImage.cpp.o: CMakeFiles/DisplayImage.dir/flags.make CMakeFiles/DisplayImage.dir/DisplayImage.cpp.o: DisplayImage.cpp - $(CMAKE_COMMAND) -E cmake_progress_report /home/sasl/eleves/rob/3408017/projet_info/CMakeFiles $(CMAKE_PROGRESS_1) + $(CMAKE_COMMAND) -E cmake_progress_report /home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code/CMakeFiles $(CMAKE_PROGRESS_1) @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Building CXX object CMakeFiles/DisplayImage.dir/DisplayImage.cpp.o" - /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -o CMakeFiles/DisplayImage.dir/DisplayImage.cpp.o -c /home/sasl/eleves/rob/3408017/projet_info/DisplayImage.cpp + /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -o CMakeFiles/DisplayImage.dir/DisplayImage.cpp.o -c /home/sasl/eleves/rob/3408212/rob3-projetsinfo-g15-2017/code/DisplayImage.cpp CMakeFiles/DisplayImage.dir/DisplayImage.cpp.i: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/DisplayImage.dir/DisplayImage.cpp.i" - /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -E /home/sasl/eleves/rob/3408017/projet_info/DisplayImage.cpp > 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 f5d6af4..d1abd8a Binary files a/code/DisplayImage and b/code/DisplayImage differ diff --git a/code/DisplayImage.cpp b/code/DisplayImage.cpp index c98abe8..88c76b4 100644 --- a/code/DisplayImage.cpp +++ b/code/DisplayImage.cpp @@ -28,6 +28,7 @@ int main(int argc, char* argv[]) // Create a window in which the captured images will be presented cvNamedWindow( "Camera", CV_WINDOW_AUTOSIZE ); cvNamedWindow( "HSV", CV_WINDOW_AUTOSIZE ); + cvNamedWindow( "Binaire", CV_WINDOW_AUTOSIZE ); // get the image data height = frame->height; @@ -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)