Merge pull request #2 from WytsedeWitte/develop

Develop into master merge

.gitignore

@@ -0,0 +1,92 @@
+### CLion ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### CLion Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+# .idea/misc.xml
+# *.ipr
+
+# Cache file creation bug
+# See https://youtrack.jetbrains.com/issue/JBR-2257
+.idea/$CACHE_FILE$
+
+# CodeStream plugin
+# https://plugins.jetbrains.com/plugin/12206-codestream
+.idea/codestream.xml
+
+# ignore directories
+dir_to_ignore/CLionProjects/windturbine/cmake-build-debug/images
+dir_to_ignore/CLionProjects/windturbine/cmake-build-debug/videos

CMakeLists.txt

@@ -1,9 +1,9 @@
-cmake_minimum_required(VERSION 3.17)
-project(Detection)
+cmake_minimum_required(VERSION 3.13)
+project(main)
 
 set(CMAKE_CXX_STANDARD 17)
 find_package( OpenCV REQUIRED )
 set(SOURCE_FILES main.cpp detection.cpp)
 add_executable(${PROJECT_NAME} ${SOURCE_FILES})
 include_directories(${OpenCV_INCLUDE_DIRS})
-target_link_libraries( ${PROJECT_NAME} ${OpenCV_LIBS} )
+target_link_libraries( ${PROJECT_NAME} ${OpenCV_LIBS} )

README.md

@@ -1,2 +1,13 @@
 # windturbine_detection
-C++ code
+This is an algorithm to detect wind turbines with help of the openCV library.
+The algorihm makes use of the Hough transform.
+
+# prerequisites
+OpenCV (using 4.5.0-dev at moment of writing this)
+Cmake 3.13 or higher
+
+# To run the project run the following commands:
+- mkdir build && cd build
+- cmake ..
+- make
+- ./main

cmake-build-debug/CMakeCache.txt

@@ -1,6 +1,6 @@
 # This is the CMakeCache file.
-# For build in directory: /home/wytse/CLionProjects/windturbine/cmake-build-debug
-# It was generated by CMake: /opt/clion-2020.2.3/bin/cmake/linux/bin/cmake
+# For build in directory: /home/wytse/project/windturbine/cmake-build-debug
+# It was generated by CMake: /snap/clion/135/bin/cmake/linux/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.
 # If you do want to change a value, simply edit, save, and exit the editor.
@@ -14,6 +14,12 @@
 # EXTERNAL cache entries
 ########################
 
+//No help, variable specified on the command line.
+BUILD_EXAMPLES:UNINITIALIZED=OFF
+
+//No help, variable specified on the command line.
+BUILD_TESTS:UNINITIALIZED=OFF
+
 //Path to a program.
 CMAKE_ADDR2LINE:FILEPATH=/usr/bin/addr2line
 
@@ -156,7 +162,7 @@ CMAKE_PROJECT_DESCRIPTION:STATIC=
 CMAKE_PROJECT_HOMEPAGE_URL:STATIC=
 
 //Value Computed by CMake
-CMAKE_PROJECT_NAME:STATIC=Detection
+CMAKE_PROJECT_NAME:STATIC=main
 
 //Path to a program.
 CMAKE_RANLIB:FILEPATH=/usr/bin/ranlib
@@ -166,7 +172,7 @@ CMAKE_READELF:FILEPATH=/usr/bin/readelf
 
 //Flags used by the linker during the creation of shared libraries
 // during all build types.
-CMAKE_SHARED_LINKER_FLAGS:STRING=
+CMAKE_SHARED_LINKER_FLAGS:STRING=-latomic
 
 //Flags used by the linker during the creation of shared libraries
 // during DEBUG builds.
@@ -221,10 +227,25 @@ CMAKE_STRIP:FILEPATH=/usr/bin/strip
 CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE
 
 //Value Computed by CMake
-Detection_BINARY_DIR:STATIC=/home/wytse/CLionProjects/windturbine/cmake-build-debug
+Detection_BINARY_DIR:STATIC=/home/wytse/project/windturbine/cmake-build-debug
 
 //Value Computed by CMake
-Detection_SOURCE_DIR:STATIC=/home/wytse/CLionProjects/windturbine
+Detection_SOURCE_DIR:STATIC=/home/wytse/project/windturbine
+
+//No help, variable specified on the command line.
+ENABLE_NEON:UNINITIALIZED=ON
+
+//No help, variable specified on the command line.
+ENABLE_VFPV3:UNINITIALIZED=ON
+
+//No help, variable specified on the command line.
+INSTALL_PYTHON_EXAMPLES:UNINITIALIZED=OFF
+
+//No help, variable specified on the command line.
+OPENCV_ENABLE_NONFREE:UNINITIALIZED=ON
+
+//No help, variable specified on the command line.
+OPENCV_EXTRA_MODULES_PATH:UNINITIALIZED=/home/wytse/opencv_contrib/modules
 
 //The directory containing a CMake configuration file for OpenCV.
 OpenCV_DIR:PATH=/usr/local/lib/cmake/opencv4
@@ -236,10 +257,10 @@ ProcessorCount_cmd_nproc:FILEPATH=/usr/bin/nproc
 ProcessorCount_cmd_sysctl:FILEPATH=/sbin/sysctl
 
 //Value Computed by CMake
-windturbine_BINARY_DIR:STATIC=/home/wytse/CLionProjects/windturbine/cmake-build-debug
+main_BINARY_DIR:STATIC=/home/wytse/project/windturbine/cmake-build-debug
 
 //Value Computed by CMake
-windturbine_SOURCE_DIR:STATIC=/home/wytse/CLionProjects/windturbine
+main_SOURCE_DIR:STATIC=/home/wytse/project/windturbine
 
 
 ########################
@@ -251,7 +272,7 @@ CMAKE_ADDR2LINE-ADVANCED:INTERNAL=1
 //ADVANCED property for variable: CMAKE_AR
 CMAKE_AR-ADVANCED:INTERNAL=1
 //This is the directory where this CMakeCache.txt was created
-CMAKE_CACHEFILE_DIR:INTERNAL=/home/wytse/CLionProjects/windturbine/cmake-build-debug
+CMAKE_CACHEFILE_DIR:INTERNAL=/home/wytse/project/windturbine/cmake-build-debug
 //Major version of cmake used to create the current loaded cache
 CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3
 //Minor version of cmake used to create the current loaded cache
@@ -261,11 +282,11 @@ CMAKE_CACHE_PATCH_VERSION:INTERNAL=3
 //ADVANCED property for variable: CMAKE_COLOR_MAKEFILE
 CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1
 //Path to CMake executable.
-CMAKE_COMMAND:INTERNAL=/opt/clion-2020.2.3/bin/cmake/linux/bin/cmake
+CMAKE_COMMAND:INTERNAL=/snap/clion/135/bin/cmake/linux/bin/cmake
 //Path to cpack program executable.
-CMAKE_CPACK_COMMAND:INTERNAL=/opt/clion-2020.2.3/bin/cmake/linux/bin/cpack
+CMAKE_CPACK_COMMAND:INTERNAL=/snap/clion/135/bin/cmake/linux/bin/cpack
 //Path to ctest program executable.
-CMAKE_CTEST_COMMAND:INTERNAL=/opt/clion-2020.2.3/bin/cmake/linux/bin/ctest
+CMAKE_CTEST_COMMAND:INTERNAL=/snap/clion/135/bin/cmake/linux/bin/ctest
 //ADVANCED property for variable: CMAKE_CXX_COMPILER
 CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1
 //ADVANCED property for variable: CMAKE_CXX_COMPILER_AR
@@ -334,7 +355,7 @@ CMAKE_GENERATOR_PLATFORM:INTERNAL=
 CMAKE_GENERATOR_TOOLSET:INTERNAL=
 //Source directory with the top level CMakeLists.txt file for this
 // project
-CMAKE_HOME_DIRECTORY:INTERNAL=/home/wytse/CLionProjects/windturbine
+CMAKE_HOME_DIRECTORY:INTERNAL=/home/wytse/project/windturbine
 //Install .so files without execute permission.
 CMAKE_INSTALL_SO_NO_EXE:INTERNAL=1
 //ADVANCED property for variable: CMAKE_LINKER
@@ -366,7 +387,7 @@ CMAKE_RANLIB-ADVANCED:INTERNAL=1
 //ADVANCED property for variable: CMAKE_READELF
 CMAKE_READELF-ADVANCED:INTERNAL=1
 //Path to CMake installation.
-CMAKE_ROOT:INTERNAL=/opt/clion-2020.2.3/bin/cmake/linux/share/cmake-3.17
+CMAKE_ROOT:INTERNAL=/snap/clion/135/bin/cmake/linux/share/cmake-3.17
 //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS
 CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1
 //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG

cmake-build-debug/CMakeFiles/3.17.3/CMakeSystem.cmake

@@ -1,13 +1,13 @@
-set(CMAKE_HOST_SYSTEM "Linux-5.4.0-48-generic")
+set(CMAKE_HOST_SYSTEM "Linux-5.4.0-52-generic")
 set(CMAKE_HOST_SYSTEM_NAME "Linux")
-set(CMAKE_HOST_SYSTEM_VERSION "5.4.0-48-generic")
+set(CMAKE_HOST_SYSTEM_VERSION "5.4.0-52-generic")
 set(CMAKE_HOST_SYSTEM_PROCESSOR "x86_64")
 
 
 
-set(CMAKE_SYSTEM "Linux-5.4.0-48-generic")
+set(CMAKE_SYSTEM "Linux-5.4.0-52-generic")
 set(CMAKE_SYSTEM_NAME "Linux")
-set(CMAKE_SYSTEM_VERSION "5.4.0-48-generic")
+set(CMAKE_SYSTEM_VERSION "5.4.0-52-generic")
 set(CMAKE_SYSTEM_PROCESSOR "x86_64")
 
 set(CMAKE_CROSSCOMPILING "FALSE")

cmake-build-debug/CMakeFiles/CMakeDirectoryInformation.cmake

@@ -2,8 +2,8 @@
 # Generated by "Unix Makefiles" Generator, CMake Version 3.17
 
 # Relative path conversion top directories.
-set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/wytse/CLionProjects/windturbine")
-set(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/wytse/CLionProjects/windturbine/cmake-build-debug")
+set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/wytse/project/windturbine")
+set(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/wytse/project/windturbine/cmake-build-debug")
 
 # Force unix paths in dependencies.
 set(CMAKE_FORCE_UNIX_PATHS 1)