diff --git a/Input/input.cpp b/Input/input.cpp index 0c55cc1..9e1001f 100644 --- a/Input/input.cpp +++ b/Input/input.cpp @@ -1,6 +1,5 @@ #include "input.h" - Input::Input(/* args */) { } @@ -11,15 +10,24 @@ Input::~Input() Mat Input::readFile(String filePath) { - Mat image = imread(filePath, IMREAD_COLOR); + std::srand(std::time(0)); + // Read all .jpg files from the specified folder + std::string folder = filePath; + std::vector filenames; + cv::glob(folder, filenames); + + // Random shuffle + std::random_shuffle(filenames.begin(), filenames.end()); + + Mat image = imread(filenames[0], IMREAD_COLOR); + if(image.empty()) { std::cout << "Could not read the image: " << filePath << std::endl; return Mat(); //To do:Exception handeling } - imshow("Display window", image); - waitKey(0); + return image; } @@ -39,8 +47,6 @@ Mat Input::readWebcam() } cap.read(image); - imshow("Display window", image); - waitKey(0); - + return image; } \ No newline at end of file diff --git a/Input/input.h b/Input/input.h index b2823f9..c0211c9 100644 --- a/Input/input.h +++ b/Input/input.h @@ -1,4 +1,7 @@ #include +#include +#include +#include #include using namespace std; diff --git a/Processing/processing.cpp b/Processing/processing.cpp index 6fa26b0..d8786bf 100644 --- a/Processing/processing.cpp +++ b/Processing/processing.cpp @@ -8,8 +8,10 @@ Processing::~Processing() { } -Mat Processing::calculate_binaray(const Mat& inputPicture) +Mat Processing::calculate_binaray(Mat& inputPicture, int thresholdValue) { - //cvtColor(inputPicture, inputPicture, COLOR_RGB2GRAY); - return Mat(); + //Mat &outputPicture; + cvtColor(inputPicture, inputPicture, COLOR_BGR2GRAY); + threshold(inputPicture, inputPicture, thresholdValue, 255, THRESH_BINARY); + return inputPicture; } \ No newline at end of file diff --git a/Processing/processing.h b/Processing/processing.h index 9afec67..1d10cbb 100644 --- a/Processing/processing.h +++ b/Processing/processing.h @@ -16,5 +16,5 @@ public: // End und Anfangspunkt analysieren und Winkel und Ausrichtung der Linie extrahieren (Abstand des untersten Punktes von der Mitte) ~Processing(); - Mat calculate_binaray(const Mat& inputPicture); + Mat calculate_binaray(Mat& inputPicture, int thresholdValue); }; \ No newline at end of file diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.14.jpeg b/Test_data/image1.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.14.jpeg rename to Test_data/image1.jpeg diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.20 (1).jpeg b/Test_data/image10.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.20 (1).jpeg rename to Test_data/image10.jpeg diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.20.jpeg b/Test_data/image11.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.20.jpeg rename to Test_data/image11.jpeg diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.21 (1).jpeg b/Test_data/image12.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.21 (1).jpeg rename to Test_data/image12.jpeg diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.21.jpeg b/Test_data/image13.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.21.jpeg rename to Test_data/image13.jpeg diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.22 (1).jpeg b/Test_data/image14.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.22 (1).jpeg rename to Test_data/image14.jpeg diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.22.jpeg b/Test_data/image15.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.22.jpeg rename to Test_data/image15.jpeg diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.23 (1).jpeg b/Test_data/image16.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.23 (1).jpeg rename to Test_data/image16.jpeg diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.23.jpeg b/Test_data/image17.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.23.jpeg rename to Test_data/image17.jpeg diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.24 (1).jpeg b/Test_data/image18.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.24 (1).jpeg rename to Test_data/image18.jpeg diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.24 (2).jpeg b/Test_data/image19.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.24 (2).jpeg rename to Test_data/image19.jpeg diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.15.jpeg b/Test_data/image2.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.15.jpeg rename to Test_data/image2.jpeg diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.24.jpeg b/Test_data/image20.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.24.jpeg rename to Test_data/image20.jpeg diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.25 (1).jpeg b/Test_data/image21.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.25 (1).jpeg rename to Test_data/image21.jpeg diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.25.jpeg b/Test_data/image22.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.25.jpeg rename to Test_data/image22.jpeg diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.26 (1).jpeg b/Test_data/image23.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.26 (1).jpeg rename to Test_data/image23.jpeg diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.26.jpeg b/Test_data/image24.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.26.jpeg rename to Test_data/image24.jpeg diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.27 (1).jpeg b/Test_data/image25.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.27 (1).jpeg rename to Test_data/image25.jpeg diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.27.jpeg b/Test_data/image26.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.27.jpeg rename to Test_data/image26.jpeg diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.28 (1).jpeg b/Test_data/image27.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.28 (1).jpeg rename to Test_data/image27.jpeg diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.28.jpeg b/Test_data/image28.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.28.jpeg rename to Test_data/image28.jpeg diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.16 (1).jpeg b/Test_data/image3.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.16 (1).jpeg rename to Test_data/image3.jpeg diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.16.jpeg b/Test_data/image4.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.16.jpeg rename to Test_data/image4.jpeg diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.17.jpeg b/Test_data/image5.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.17.jpeg rename to Test_data/image5.jpeg diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.18 (1).jpeg b/Test_data/image6.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.18 (1).jpeg rename to Test_data/image6.jpeg diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.18.jpeg b/Test_data/image7.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.18.jpeg rename to Test_data/image7.jpeg diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.19 (1).jpeg b/Test_data/image8.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.19 (1).jpeg rename to Test_data/image8.jpeg diff --git a/Test_data/WhatsApp Image 2022-10-26 at 09.54.19.jpeg b/Test_data/image9.jpeg similarity index 100% rename from Test_data/WhatsApp Image 2022-10-26 at 09.54.19.jpeg rename to Test_data/image9.jpeg diff --git a/lfr.cpp b/lfr.cpp index 754f28e..3d7df0f 100644 --- a/lfr.cpp +++ b/lfr.cpp @@ -5,10 +5,18 @@ using namespace cv; +const int threshold_binary = 110; + 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 image2 = test.readWebcam(); + Processing test1; + Mat image1 = test.readFile("C:\\Line-Following-Robot\\Test_data\\*.jpeg"); + //Mat image2 = test.readWebcam(); + + test1.calculate_binaray(image1, threshold_binary); + imshow("Display window", image1); + waitKey(0); + } \ No newline at end of file