diff --git a/CMakeLists.txt b/CMakeLists.txt index 96c73f9..d4afe3f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,14 +11,12 @@ link_directories( ${Input_SOURCE_DIRS} ) add_subdirectory(Input) target_include_directories(Input PRIVATE .) - add_executable(lfr_image_processing lfr.cpp) target_link_libraries( lfr_image_processing ${OpenCV_LIBS}) target_link_libraries( lfr_image_processing Input ) - set(CPACK_PROJECT_NAME ${PROJECT_NAME}) set(CPACK_PROJECT_VERSION ${PROJECT_VERSION}) include(CPack) diff --git a/Input/CMakeLists.txt b/Input/CMakeLists.txt index 75c2bac..f6c1d8a 100644 --- a/Input/CMakeLists.txt +++ b/Input/CMakeLists.txt @@ -1,6 +1,6 @@ find_package( OpenCV REQUIRED ) include_directories( ${OpenCV_INCLUDE_DIRS} ) - + add_library(Input input.cpp) set_target_properties(Input PROPERTIES VERSION ${PROJECT_VERSION}) target_include_directories(Input PRIVATE .) diff --git a/Input/input.cpp b/Input/input.cpp index 0ce021f..3a1ebb1 100644 --- a/Input/input.cpp +++ b/Input/input.cpp @@ -1,5 +1,6 @@ #include "input.h" + Input::Input(/* args */) { } @@ -22,7 +23,22 @@ Mat Input::readFile(String filePath) return image; } -void Input::readWebcam() +Mat Input::readWebcam() { - //To do an Raspberry-Pi + const int VID_HEIGHT = 1232; + const int VID_WIDTH = 1640; + Mat image; + VideoCapture cap(0); + + cap.set(CAP_PROP_FRAME_HEIGHT, VID_HEIGHT); + cap.set(CAP_PROP_FRAME_WIDTH, VID_WIDTH); + + if(!cap.isOpened()) { + cout << "Fehler"; + return Mat(); + } + + cap.read(image); + + return image; } \ No newline at end of file diff --git a/Input/input.h b/Input/input.h index 240c188..b2823f9 100644 --- a/Input/input.h +++ b/Input/input.h @@ -12,7 +12,7 @@ public: Input(/* args */); ~Input(); Mat readFile(String filePath); - void readWebcam(); + Mat readWebcam(); }; diff --git a/lfr.cpp b/lfr.cpp index 28ae978..2a0cd5d 100644 --- a/lfr.cpp +++ b/lfr.cpp @@ -10,5 +10,6 @@ int main(void) { std::cout<<"Hello world"; Input test; - Mat image = test.readFile("C:\\Line-Following-Robot\\Test_data\\WhatsApp Image 2022-10-26 at 09.54.14.jpeg"); + Mat image1 = test.readFile("C:\\Line-Following-Robot\\Test_data\\WhatsApp Image 2022-10-26 at 09.54.14.jpeg"); + Mat image2 = test.readWebcam(); } \ No newline at end of file