From d43cedf6f3e071f4e14cbc8ae2bdb6bd9e0adb9e Mon Sep 17 00:00:00 2001
From: yasarba71520 <yasarba71520@th-nuernberg.de>
Date: Tue, 1 Nov 2022 14:18:02 +0100
Subject: [PATCH] =?UTF-8?q?Processing=20hinzugef=C3=BCgt=20V2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt            |  7 ++++++-
 Input/input.cpp           |  9 +++++++--
 Processing/CMakeLists.txt | 12 ++++++++++++
 Processing/processing.cpp |  9 +++++++++
 lfr.cpp                   |  3 ++-
 5 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 Processing/CMakeLists.txt
 create mode 100644 Processing/processing.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d4afe3f..84dceb8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,15 +7,20 @@ enable_testing()
 find_package( OpenCV REQUIRED )
 include_directories( ${OpenCV_INCLUDE_DIRS} )
 include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/Input )
+include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/Processing)
 link_directories( ${Input_SOURCE_DIRS} )
+link_directories( ${Processing_SOURCE_DIRS} )
 
 add_subdirectory(Input)
+add_subdirectory(Processing)
 target_include_directories(Input PRIVATE .)
-add_executable(lfr_image_processing lfr.cpp)
+target_include_directories(Processing PRIVATE .)
 
+add_executable(lfr_image_processing lfr.cpp)
 
 target_link_libraries( lfr_image_processing ${OpenCV_LIBS})
 target_link_libraries( lfr_image_processing Input )
+target_link_libraries( lfr_image_processing Processing )
 
 set(CPACK_PROJECT_NAME ${PROJECT_NAME})
 set(CPACK_PROJECT_VERSION ${PROJECT_VERSION})
diff --git a/Input/input.cpp b/Input/input.cpp
index 3a1ebb1..aa791d5 100644
--- a/Input/input.cpp
+++ b/Input/input.cpp
@@ -25,8 +25,8 @@ Mat Input::readFile(String filePath)
 
 Mat Input::readWebcam()
 {
-    const int VID_HEIGHT = 1232;
-    const int VID_WIDTH = 1640;
+    const int VID_HEIGHT = 240;
+    const int VID_WIDTH = 320;
     Mat image;
     VideoCapture cap(0);
 
@@ -36,9 +36,14 @@ Mat Input::readWebcam()
     if(!cap.isOpened()) {
         cout << "Fehler";
         return Mat();
+        return Mat();
+        return Mat();
+
     }
 
     cap.read(image);
+    imshow("Display window", image);
+    waitKey(0);
 
     return image;  
 }
\ No newline at end of file
diff --git a/Processing/CMakeLists.txt b/Processing/CMakeLists.txt
new file mode 100644
index 0000000..a48ea04
--- /dev/null
+++ b/Processing/CMakeLists.txt
@@ -0,0 +1,12 @@
+find_package( OpenCV REQUIRED )
+include_directories( ${OpenCV_INCLUDE_DIRS} )
+ 
+add_library(Processing processing.cpp)
+set_target_properties(Processing PROPERTIES VERSION ${PROJECT_VERSION})
+target_include_directories(Processing PRIVATE .)
+
+target_link_libraries( Processing ${OpenCV_LIBS})
+
+set(CPACK_PROJECT_NAME ${PROJECT_NAME})
+set(CPACK_PROJECT_VERSION ${PROJECT_VERSION})
+include(CPack)
\ No newline at end of file
diff --git a/Processing/processing.cpp b/Processing/processing.cpp
new file mode 100644
index 0000000..34915ed
--- /dev/null
+++ b/Processing/processing.cpp
@@ -0,0 +1,9 @@
+#include "processing.h"
+
+processing::processing(/* args */)
+{
+}
+
+processing::~processing()
+{
+}
\ No newline at end of file
diff --git a/lfr.cpp b/lfr.cpp
index 2a0cd5d..01ce917 100644
--- a/lfr.cpp
+++ b/lfr.cpp
@@ -3,6 +3,7 @@
 #include <iostream>
 #include <opencv2/opencv.hpp>
 #include <input.h>
+#include <processing.h>
 
 using namespace cv;
 
@@ -10,6 +11,6 @@ int main(void)
 {
     std::cout<<"Hello world";
     Input test;
-    Mat image1 = 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