diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a1949c..57ebfb2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,7 @@ set(LIBRARY_DEPS ${OpenCV_LIBS}) # BUILD add_subdirectory(sample_template) +add_subdirectory(sample_Moskalenko) # Add you directory here # add_subdirectory(sample_YOUR_NAME) diff --git a/sample_Moskalenko/CMakeLists.txt b/sample_Moskalenko/CMakeLists.txt new file mode 100644 index 0000000..1daccd5 --- /dev/null +++ b/sample_Moskalenko/CMakeLists.txt @@ -0,0 +1,7 @@ +set(target "sample_Moskalenko") + +file(GLOB hdrs "*.hpp") +file(GLOB srcs "*.cpp") + +add_executable(${target} ${srcs} ${hdrs}) +target_link_libraries(${target} ${LIBRARY_DEPS}) diff --git a/sample_Moskalenko/application.cpp b/sample_Moskalenko/application.cpp new file mode 100644 index 0000000..4cc18d1 --- /dev/null +++ b/sample_Moskalenko/application.cpp @@ -0,0 +1,123 @@ +#include "application.hpp" +#include "processing.hpp" + +#include + +using namespace cv; + +int Application::parseArguments(int argc, const char **argv, + Application::Parameters ¶ms) +{ + if (argc < 2) + { + return 1; + } + params.imgFileName = std::string(argv[1]); + return 0; +} + +int Application::getFrame(const std::string &fileName, Mat& src) +{ + src = imread(fileName); + if (src.empty()) + { + return 1; + } + return 0; +} + +int Application::processFrame(const Mat& src, Mat& dst) +{ + processor.processFrame(src, dst); + + if (dst.empty()) + { + return 1; + } + + return 0; +} + +int Application::drawButtons(Mat &display) +{ + guiState.onButtonPlace = Rect(20, display.rows - 60, 120, 40); + guiState.offButtonPlace = Rect(160, display.rows - 60, 120, 40); + rectangle(display, guiState.onButtonPlace, + Scalar(128, 128, 128), CV_FILLED); + rectangle(display, guiState.offButtonPlace, + Scalar(128, 128, 128), CV_FILLED); + + putText(display, "on", + Point(guiState.onButtonPlace.x + guiState.onButtonPlace.width / 2 - 15, + guiState.onButtonPlace.y + guiState.onButtonPlace.height / 2 + 10), + FONT_HERSHEY_SIMPLEX, 1.0, Scalar(0, 0, 0), 2); + putText(display, "off", + Point(guiState.offButtonPlace.x + guiState.offButtonPlace.width / 2 - 20, + guiState.offButtonPlace.y + guiState.offButtonPlace.height / 2 + 10), + FONT_HERSHEY_SIMPLEX, 1.0, Scalar(0, 0, 0), 2); + + return 0; +} + +int Application::showFrame(const std::string &caption, + const Mat& src, Mat& dst) +{ + if (guiState.state == OffFilter) + { + src.copyTo(dst); + } + else if (guiState.state == OnFilter) + { + processFrame(src, dst); + } + else + { + return 1; + } + + Mat display(src.rows, src.cols + dst.cols, src.type()); + Mat srcRoi = display(Rect(0, 0, src.cols, src.rows)); + src.copyTo(srcRoi); + Mat dstRoi = display(Rect(src.cols, 0, dst.cols, dst.rows)); + dst.copyTo(dstRoi); + + drawButtons(display); + + namedWindow(caption); + imshow(caption, display); + setMouseCallback(caption, onButtonsOnOffClick, &guiState); + char key = waitKey(1); + + return key; +} + +void onButtonsOnOffClick(int eventId, int x, int y, int flags, void *userData) +{ + if (eventId != EVENT_LBUTTONDOWN) + { + return; + } + Application::GUIElementsState *elems = + (Application::GUIElementsState *)userData; + if (onButtonClicked(elems->onButtonPlace, x, y)) + { + elems->state = Application::OnFilter; + return; + } + if (onButtonClicked(elems->offButtonPlace, x, y)) + { + elems->state = Application::OffFilter; + return; + } +} + +bool onButtonClicked(cv::Rect buttonPlace, int x, int y) +{ + if (x < buttonPlace.x || x > buttonPlace.x + buttonPlace.width || + y < buttonPlace.y || y > buttonPlace.y + buttonPlace.height) + { + return false; + } + return true; +} + diff --git a/sample_Moskalenko/application.hpp b/sample_Moskalenko/application.hpp new file mode 100644 index 0000000..862cc3f --- /dev/null +++ b/sample_Moskalenko/application.hpp @@ -0,0 +1,49 @@ +#pragma once + +#include +#include +#include + +#include "processing.hpp" + +bool onButtonClicked(cv::Rect buttonPlace, int x, int y); +void onButtonsOnOffClick(int eventId, int x, int y, int flags, void *userData); + +class Application +{ + public: + enum WindowState + { + OnFilter, + OffFilter + }; + struct Parameters + { + std::string imgFileName; + }; + struct GUIElementsState + { + WindowState state; + cv::Rect onButtonPlace; + cv::Rect offButtonPlace; + }; + int parseArguments(int argc, const char **argv, Parameters ¶ms); + int getFrame(const std::string &fileName, cv::Mat& src); + int processFrame(const cv::Mat& src, cv::Mat& dst); + int showFrame(const std::string &caption, + const cv::Mat& src, cv::Mat& dst); + friend void onButtonsOnOffClick(int eventId, int x, int y, + int flags, void *userData); + Application() + { + guiState.state = OnFilter; + }; + + private: + Processing processor; + GUIElementsState guiState; + + int drawButtons(cv::Mat &display); + + friend bool onButtonClicked(cv::Rect buttonPlace, int x, int y); +}; diff --git a/sample_Moskalenko/main.cpp b/sample_Moskalenko/main.cpp new file mode 100644 index 0000000..43ff041 --- /dev/null +++ b/sample_Moskalenko/main.cpp @@ -0,0 +1,44 @@ +#include +#include + +#include "application.hpp" + +using namespace std; +using namespace cv; + +enum ErrorCode { + OK, + WRONG_ARGUMENTS, + WRONG_INPUT, + CANT_PROCESS +}; + +int main(int argc, const char **argv) +{ + Application app; + Application::Parameters params; + + if (app.parseArguments(argc, argv, params) != 0) + { + cout << "sample_template " << endl; + cout << " - image name for filtering" << endl; + return WRONG_ARGUMENTS; + } + + Mat src; + if (app.getFrame(params.imgFileName, src) != 0) + { + cout << "Error: \'src\' image is null or empty!" << endl; + return WRONG_INPUT; + } + + const std::string caption = "OpenCV Sample"; + char key = 0; + Mat dst(src.rows, src.cols, src.type()); + while (key != 27) // Esc + { + key = app.showFrame(caption, src, dst); + } + + return OK; +} diff --git a/sample_Moskalenko/processing.cpp b/sample_Moskalenko/processing.cpp new file mode 100644 index 0000000..bd51a88 --- /dev/null +++ b/sample_Moskalenko/processing.cpp @@ -0,0 +1,18 @@ +#include "processing.hpp" + +#include + +using namespace cv; + +void Processing::processFrame(const cv::Mat& src, cv::Mat& dst) +{ + src.copyTo(dst); + + cv::Rect region(src.rows/4, src.cols/4, src.rows/2, src.cols/2); + Mat roi = dst(region); + + const int kSize = 11; + medianBlur(roi, roi, kSize); + + rectangle(dst, region, Scalar(255, 0, 0)); +} diff --git a/sample_Moskalenko/processing.hpp b/sample_Moskalenko/processing.hpp new file mode 100644 index 0000000..65f29fc --- /dev/null +++ b/sample_Moskalenko/processing.hpp @@ -0,0 +1,9 @@ +#pragma once + +#include + +class Processing +{ + public: + void processFrame(const cv::Mat& src, cv::Mat& dst); +}; diff --git a/sample_template/application.cpp b/sample_template/application.cpp index 4cc18d1..fab1d08 100644 --- a/sample_template/application.cpp +++ b/sample_template/application.cpp @@ -1,10 +1,16 @@ #include "application.hpp" #include "processing.hpp" +#include "time.h" +#include "stdlib.h" +#include #include +using namespace std; using namespace cv; +bool testfunction() { return true; } + int Application::parseArguments(int argc, const char **argv, Application::Parameters ¶ms) { @@ -26,9 +32,9 @@ int Application::getFrame(const std::string &fileName, Mat& src) return 0; } -int Application::processFrame(const Mat& src, Mat& dst) +int Application::processFrame(const Mat& src, Mat& dst, Processing::FilterType filter) { - processor.processFrame(src, dst); + processor.processFrame(src, dst, filter); if (dst.empty()) { @@ -42,10 +48,25 @@ int Application::drawButtons(Mat &display) { guiState.onButtonPlace = Rect(20, display.rows - 60, 120, 40); guiState.offButtonPlace = Rect(160, display.rows - 60, 120, 40); + guiState.saveButtonPlace = Rect(300, display.rows - 60, 120, 40); + guiState.CVT_CONVERT_GRAY_ButtonPlace = Rect(20, display.rows - 110, 120, 40); + guiState.PIXELIZED_ButtonPlace = Rect(160, display.rows - 110, 120, 40); + guiState.CANNY_ButtonPlace = Rect(300, display.rows - 110, 120, 40); + /*cv::Rect CVT_CONVERT_GRAY_ButtonPlace; + cv::Rect PIXELIZED_ButtonPlace; + cv::Rect CANNY_ButtonPlace;*/ rectangle(display, guiState.onButtonPlace, Scalar(128, 128, 128), CV_FILLED); rectangle(display, guiState.offButtonPlace, Scalar(128, 128, 128), CV_FILLED); + rectangle(display, guiState.saveButtonPlace, + Scalar(128, 128, 128), CV_FILLED); + rectangle(display, guiState.CVT_CONVERT_GRAY_ButtonPlace, + Scalar(128, 128, 128), CV_FILLED); + rectangle(display, guiState.PIXELIZED_ButtonPlace, + Scalar(128, 128, 128), CV_FILLED); + rectangle(display, guiState.CANNY_ButtonPlace, + Scalar(128, 128, 128), CV_FILLED); putText(display, "on", Point(guiState.onButtonPlace.x + guiState.onButtonPlace.width / 2 - 15, @@ -55,6 +76,22 @@ int Application::drawButtons(Mat &display) Point(guiState.offButtonPlace.x + guiState.offButtonPlace.width / 2 - 20, guiState.offButtonPlace.y + guiState.offButtonPlace.height / 2 + 10), FONT_HERSHEY_SIMPLEX, 1.0, Scalar(0, 0, 0), 2); + putText(display, "save", + Point(guiState.saveButtonPlace.x + guiState.saveButtonPlace.width / 2 - 30, + guiState.saveButtonPlace.y + guiState.saveButtonPlace.height / 2 + 10), + FONT_HERSHEY_SIMPLEX, 1.0, Scalar(0, 0, 0), 2); + putText(display, "GRAY", + Point(guiState.CVT_CONVERT_GRAY_ButtonPlace.x + guiState.CVT_CONVERT_GRAY_ButtonPlace.width / 2 - 35, + guiState.CVT_CONVERT_GRAY_ButtonPlace.y + guiState.CVT_CONVERT_GRAY_ButtonPlace.height / 2 + 10), + FONT_HERSHEY_SIMPLEX, 1.0, Scalar(0, 0, 0), 2); + putText(display, "PIX", + Point(guiState.PIXELIZED_ButtonPlace.x + guiState.PIXELIZED_ButtonPlace.width / 2 - 25, + guiState.PIXELIZED_ButtonPlace.y + guiState.PIXELIZED_ButtonPlace.height / 2 + 10), + FONT_HERSHEY_SIMPLEX, 1.0, Scalar(0, 0, 0), 2); + putText(display, "CANNY", + Point(guiState.CANNY_ButtonPlace.x + guiState.CANNY_ButtonPlace.width / 2 - 45, + guiState.CANNY_ButtonPlace.y + guiState.CANNY_ButtonPlace.height / 2 + 10), + FONT_HERSHEY_SIMPLEX, 1.0, Scalar(0, 0, 0), 2); return 0; } @@ -68,19 +105,36 @@ int Application::showFrame(const std::string &caption, } else if (guiState.state == OnFilter) { - processFrame(src, dst); + processFrame(src, dst, guiState.filter); } else { return 1; } + Mat display(src.rows, src.cols + dst.cols, src.type()); Mat srcRoi = display(Rect(0, 0, src.cols, src.rows)); src.copyTo(srcRoi); Mat dstRoi = display(Rect(src.cols, 0, dst.cols, dst.rows)); dst.copyTo(dstRoi); + + if (guiState.saveState) + { + // получить текущее время + // сгенерировать название изображения + // - сгенерированное название изображения + // с меткой текущего времени + // вызвать функцию сохранения imwrite(, display) + // сбросить значение guiState.saveState в false + std::stringstream ss; + ss << "image" << time(0) << ".jpg"; + imwrite(ss.str(),display); + guiState.saveState = false; + } + + drawButtons(display); namedWindow(caption); @@ -102,13 +156,37 @@ void onButtonsOnOffClick(int eventId, int x, int y, int flags, void *userData) if (onButtonClicked(elems->onButtonPlace, x, y)) { elems->state = Application::OnFilter; - return; + elems->filter=Processing::MEDIAN; + return; } if (onButtonClicked(elems->offButtonPlace, x, y)) { elems->state = Application::OffFilter; return; } + if (onButtonClicked(elems->saveButtonPlace, x, y)) + { + elems->saveState = true; + return; + } + if (onButtonClicked(elems->CVT_CONVERT_GRAY_ButtonPlace, x, y)) + { + elems->state = Application::OnFilter; + elems->filter=Processing::CVT_CONVERT_GRAY; + return; + } + if (onButtonClicked(elems->PIXELIZED_ButtonPlace, x, y)) + { + elems->state = Application::OnFilter; + elems->filter=Processing::PIXELIZED; + return; + } + if (onButtonClicked(elems->CANNY_ButtonPlace, x, y)) + { + elems->state = Application::OnFilter; + elems->filter=Processing::CANNY; + return; + } } bool onButtonClicked(cv::Rect buttonPlace, int x, int y) diff --git a/sample_template/application.hpp b/sample_template/application.hpp index 862cc3f..0e8421d 100644 --- a/sample_template/application.hpp +++ b/sample_template/application.hpp @@ -4,6 +4,7 @@ #include #include + #include "processing.hpp" bool onButtonClicked(cv::Rect buttonPlace, int x, int y); @@ -26,10 +27,16 @@ class Application WindowState state; cv::Rect onButtonPlace; cv::Rect offButtonPlace; + cv::Rect saveButtonPlace; + cv::Rect CVT_CONVERT_GRAY_ButtonPlace; + cv::Rect PIXELIZED_ButtonPlace; + cv::Rect CANNY_ButtonPlace; + bool saveState; + Processing::FilterType filter; }; int parseArguments(int argc, const char **argv, Parameters ¶ms); int getFrame(const std::string &fileName, cv::Mat& src); - int processFrame(const cv::Mat& src, cv::Mat& dst); + int processFrame(const cv::Mat& src, cv::Mat& dst, Processing::FilterType filter); int showFrame(const std::string &caption, const cv::Mat& src, cv::Mat& dst); friend void onButtonsOnOffClick(int eventId, int x, int y, @@ -37,6 +44,8 @@ class Application Application() { guiState.state = OnFilter; + guiState.saveState=false; + guiState.filter=Processing::MEDIAN; }; private: diff --git a/sample_template/processing.cpp b/sample_template/processing.cpp index bd51a88..89e54c3 100644 --- a/sample_template/processing.cpp +++ b/sample_template/processing.cpp @@ -1,18 +1,44 @@ #include "processing.hpp" +#include #include using namespace cv; +using namespace std; -void Processing::processFrame(const cv::Mat& src, cv::Mat& dst) +void Processing::processFrame(const cv::Mat& src, cv::Mat& dst, FilterType filter) { src.copyTo(dst); - cv::Rect region(src.rows/4, src.cols/4, src.rows/2, src.cols/2); + int a = clock()/100; + cv::Rect region((a*a)%(src.rows/2 - 1), a%(src.cols/2 - 1), src.rows/2, src.cols/2); Mat roi = dst(region); const int kSize = 11; - medianBlur(roi, roi, kSize); + + switch (filter) + { + case MEDIAN: { medianBlur(roi, roi, kSize); break; }; + case CVT_CONVERT_GRAY: + { + Mat ansver; + cvtColor(roi,ansver,CV_BGR2GRAY); + vector vec; + vec.push_back(ansver); + vec.push_back(ansver); + vec.push_back(ansver); + merge(vec,roi); + break; + }; + case PIXELIZED: + { + break; + }; + case CANNY: + { + break; + }; + } rectangle(dst, region, Scalar(255, 0, 0)); } diff --git a/sample_template/processing.hpp b/sample_template/processing.hpp index 65f29fc..e672ec3 100644 --- a/sample_template/processing.hpp +++ b/sample_template/processing.hpp @@ -5,5 +5,12 @@ class Processing { public: - void processFrame(const cv::Mat& src, cv::Mat& dst); + enum FilterType + { + MEDIAN, + CVT_CONVERT_GRAY, + PIXELIZED, + CANNY + }; + void processFrame(const cv::Mat& src, cv::Mat& dst, FilterType filter); };