From 17923bd066ef946b8cf90c0a92308f1fe47b7793 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 18 Aug 2015 14:19:38 +0300 Subject: [PATCH 1/4] not ready practice 2 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a1949c..ad9379b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ set(LIBRARY_DEPS ${OpenCV_LIBS}) # BUILD add_subdirectory(sample_template) # Add you directory here -# add_subdirectory(sample_YOUR_NAME) +add_subdirectory(sample_razumov) # REPORT message( STATUS "") From e4fb77850b09f9e952bb7f0740818d29752d083f Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 18 Aug 2015 14:27:23 +0300 Subject: [PATCH 2/4] not ready --- sample_razumov/CMakeLists.txt | 7 ++ sample_razumov/application.cpp | 123 +++++++++++++++++++++++++++++++++ sample_razumov/application.hpp | 49 +++++++++++++ sample_razumov/main.cpp | 44 ++++++++++++ sample_razumov/processing.cpp | 18 +++++ sample_razumov/processing.hpp | 9 +++ 6 files changed, 250 insertions(+) create mode 100644 sample_razumov/CMakeLists.txt create mode 100644 sample_razumov/application.cpp create mode 100644 sample_razumov/application.hpp create mode 100644 sample_razumov/main.cpp create mode 100644 sample_razumov/processing.cpp create mode 100644 sample_razumov/processing.hpp diff --git a/sample_razumov/CMakeLists.txt b/sample_razumov/CMakeLists.txt new file mode 100644 index 0000000..dddc875 --- /dev/null +++ b/sample_razumov/CMakeLists.txt @@ -0,0 +1,7 @@ +set(target "sample_razumov") + +file(GLOB hdrs "*.hpp") +file(GLOB srcs "*.cpp") + +add_executable(${target} ${srcs} ${hdrs}) +target_link_libraries(${target} ${LIBRARY_DEPS}) diff --git a/sample_razumov/application.cpp b/sample_razumov/application.cpp new file mode 100644 index 0000000..4cc18d1 --- /dev/null +++ b/sample_razumov/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_razumov/application.hpp b/sample_razumov/application.hpp new file mode 100644 index 0000000..862cc3f --- /dev/null +++ b/sample_razumov/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_razumov/main.cpp b/sample_razumov/main.cpp new file mode 100644 index 0000000..43ff041 --- /dev/null +++ b/sample_razumov/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_razumov/processing.cpp b/sample_razumov/processing.cpp new file mode 100644 index 0000000..bd51a88 --- /dev/null +++ b/sample_razumov/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_razumov/processing.hpp b/sample_razumov/processing.hpp new file mode 100644 index 0000000..65f29fc --- /dev/null +++ b/sample_razumov/processing.hpp @@ -0,0 +1,9 @@ +#pragma once + +#include + +class Processing +{ + public: + void processFrame(const cv::Mat& src, cv::Mat& dst); +}; From 03b8ae09d56ba64357eefd91ca97c6e46559ebba Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 18 Aug 2015 15:53:56 +0300 Subject: [PATCH 3/4] ezdit --- sample_razumov/processing.cpp | 10 ++++++---- sample_razumov/processing.hpp | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sample_razumov/processing.cpp b/sample_razumov/processing.cpp index bd51a88..a21567a 100644 --- a/sample_razumov/processing.cpp +++ b/sample_razumov/processing.cpp @@ -1,14 +1,16 @@ #include "processing.hpp" - +#include #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); + time_t timer; + timer= time(NULL); + int x; + x=src.rows/4+sin(timer/10.)*src.rows/4; + cv::Rect region(int(x), src.cols/4, src.rows/2, src.cols/2); Mat roi = dst(region); const int kSize = 11; diff --git a/sample_razumov/processing.hpp b/sample_razumov/processing.hpp index 65f29fc..05e7339 100644 --- a/sample_razumov/processing.hpp +++ b/sample_razumov/processing.hpp @@ -1,7 +1,7 @@ #pragma once #include - +#include class Processing { public: From 6e82b9ab80f9e52dbdb7d99f5e190af86be3d4de Mon Sep 17 00:00:00 2001 From: ddrazumov Date: Tue, 18 Aug 2015 18:35:00 +0300 Subject: [PATCH 4/4] 2nd task --- sample_razumov/application.cpp | 33 +++++++++++++++++++++++++++++++-- sample_razumov/application.hpp | 5 ++++- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/sample_razumov/application.cpp b/sample_razumov/application.cpp index 4cc18d1..95e6a31 100644 --- a/sample_razumov/application.cpp +++ b/sample_razumov/application.cpp @@ -1,6 +1,6 @@ #include "application.hpp" #include "processing.hpp" - +#include #include using namespace cv; @@ -42,11 +42,13 @@ 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); 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); putText(display, "on", Point(guiState.onButtonPlace.x + guiState.onButtonPlace.width / 2 - 15, guiState.onButtonPlace.y + guiState.onButtonPlace.height / 2 + 10), @@ -55,6 +57,10 @@ 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 - 35, + guiState.saveButtonPlace.y + guiState.saveButtonPlace.height / 2 + 10), + FONT_HERSHEY_SIMPLEX, 1.0, Scalar(0, 0, 0), 2); return 0; } @@ -81,6 +87,23 @@ int Application::showFrame(const std::string &caption, Mat dstRoi = display(Rect(src.cols, 0, dst.cols, dst.rows)); dst.copyTo(dstRoi); + if (guiState.saveState == true) + { + + //time_t now = time(0); + // char* dt = ctime(&now); + time_t t = time(NULL); + std::ostringstream oss; + oss << t; + std::string ctime = oss.str()+".png"; + vector compression_params; + compression_params.push_back(CV_IMWRITE_PNG_COMPRESSION); + compression_params.push_back(9); + imwrite(ctime, display, compression_params); + + guiState.saveState=false; + } + drawButtons(display); namedWindow(caption); @@ -109,6 +132,12 @@ void onButtonsOnOffClick(int eventId, int x, int y, int flags, void *userData) elems->state = Application::OffFilter; return; } + if (onButtonClicked(elems->saveButtonPlace, x, y)) + { + elems->saveState = true; + return; + } + } bool onButtonClicked(cv::Rect buttonPlace, int x, int y) diff --git a/sample_razumov/application.hpp b/sample_razumov/application.hpp index 862cc3f..0e87db7 100644 --- a/sample_razumov/application.hpp +++ b/sample_razumov/application.hpp @@ -1,5 +1,5 @@ #pragma once - +#include #include #include #include @@ -26,6 +26,8 @@ class Application WindowState state; cv::Rect onButtonPlace; cv::Rect offButtonPlace; + cv::Rect saveButtonPlace; + bool saveState; }; int parseArguments(int argc, const char **argv, Parameters ¶ms); int getFrame(const std::string &fileName, cv::Mat& src); @@ -37,6 +39,7 @@ class Application Application() { guiState.state = OnFilter; + guiState.saveState = false; }; private: