Use classes instead of plan functions

Author: Kirill Kornyakov

sample_template/application.cpp

@@ -1,11 +1,58 @@
 #include "application.hpp"
+#include "processing.hpp"
 
-int parseArguments(int argc, const char **argv, Parameters &params)
+#include <opencv2/highgui/highgui.hpp>
+
+using namespace cv;
+
+int Application::parseArguments(int argc, const char **argv, Application::Parameters &params)
 {
     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::show(const std::string &caption, const Mat& src, const Mat& dst)
+{
+    if (src.rows != dst.rows || src.cols != dst.cols)
+    {
+        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);
+
+    namedWindow(caption);
+    imshow(caption, display);
+    char key = waitKey(1);
+
+    return key;
+}

sample_template/application.hpp

@@ -1,10 +1,22 @@
 #pragma once
 
 #include <string>
+#include <opencv2/core/core.hpp>
 
-struct Parameters
+#include "processing.hpp"
+
+class Application
 {
-    std::string imgFileName;
-};
+ public:
+    struct Parameters
+    {
+        std::string imgFileName;
+    };
+    int parseArguments(int argc, const char **argv, Parameters &params);
 
-int parseArguments(int argc, const char **argv, Parameters &params);
+    int getFrame(const std::string &fileName, cv::Mat& src);
+    int processFrame(const cv::Mat& src, cv::Mat& dst);
+    int show(const std::string &caption, const cv::Mat& src, const cv::Mat& dst);
+ private:
+    Processing processor;
+};

sample_template/main.cpp

@@ -2,30 +2,31 @@
 #include <iostream>
 
 #include "application.hpp"
-#include "processing.hpp"
 
 using namespace std;
 using namespace cv;
 
 int main(int argc, const char **argv)
 {
-    Parameters params;
-    if (parseArguments(argc, argv, params) != 0)
+    Application app;
+    Application::Parameters params;
+
+    if (app.parseArguments(argc, argv, params) != 0)
     {
         cout << "practice2 <image_name>" << endl;
         cout << "<image_name> - image name for filtering" << endl;
         return 1;
     }
 
     Mat src;
-    if (getFrame(params.imgFileName, src) != 0)
+    if (app.getFrame(params.imgFileName, src) != 0)
     {
         cout << "Error: \'src\' image is null or empty!" << endl;
         return 2;
     }
 
     Mat dst;
-    if (processFrame(src, dst) != 0)
+    if (app.processFrame(src, dst) != 0)
     {
         cout << "Error: Filtering failed!" << endl;
         return 3;
@@ -34,7 +35,7 @@ int main(int argc, const char **argv)
     const std::string caption = "OpenCV Sample";
     char key = 0;
     while(key != 27) // Esc
-        key = show(caption, src, dst);
+        key = app.show(caption, src, dst);
 
 	return 0;
 }

sample_template/processing.cpp

@@ -1,49 +1,18 @@
 #include "processing.hpp"
 
-int getFrame(const std::string &fileName, Mat& src)
-{
-    src = imread(fileName);
-    if (src.empty())
-    {
-        return 1;
-    }
-    return 0;
-}
+#include <opencv2/imgproc/imgproc.hpp>
 
-int processFrame(const Mat& src, Mat& dst)
+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);
-    const int kSize = 11;
     Mat roi = dst(region);
-    medianBlur(roi, roi, kSize);
-    rectangle(dst, region, Scalar(255, 0, 0));
 
-    if (dst.empty())
-    {
-        return 1;
-    }
+    const int kSize = 11;
+    medianBlur(roi, roi, kSize);
 
-    return 0;
+    rectangle(dst, region, Scalar(255, 0, 0));
 }
-
-int show(const std::string &caption, const Mat& src, const Mat& dst)
-{
-    if (src.rows != dst.rows || src.cols != dst.cols)
-    {
-        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);
-
-    namedWindow(caption);
-    imshow(caption, display);
-    char key = waitKey(1);
-
-    return key;
-}

sample_template/processing.hpp

@@ -1,13 +1,9 @@
 #pragma once
 
 #include <opencv2/core/core.hpp>
-#include <opencv2/highgui/highgui.hpp>
-#include <opencv2/imgproc/imgproc.hpp>
 
-using namespace cv;
-
-int getFrame(const std::string &fileName, Mat& src);
-
-int processFrame(const Mat& src, Mat& dst);
-
-int show(const std::string &caption, const Mat& src, const Mat& dst);
+class Processing
+{
+ public:
+    void processFrame(const cv::Mat& src, cv::Mat& dst);
+};