[chore] comment out some unuseful code

Author: zzo30802

CMakeLists.txt

@@ -88,7 +88,7 @@ aux_source_directory(./src/component SRC_COMPONENT)                       # cpp
 # output binary
 add_executable(${PROJECT_NAME} main.cpp ${SRC} ${SRC_COMPONENT})
 # output so
-#add_library( ${PROJECT_NAME} SHARED ${SRC} )
+#add_library( ${PROJECT_NAME} SHARED ${SRC} ${SRC_COMPONENT})
 # link library
 
 IF (WIN32)

include/component/image_proc.h

@@ -1,7 +1,11 @@
 #ifndef _IMAGE_PROC_H_
 #define _IMAGE_PROC_H_
 
-#include "common.h"
+// #include "common.h"
+// #include "opencv2/highgui.hpp"
+// #include "opencv2/imgcodecs.hpp"
+#include "opencv2/core.hpp"
+// #include "opencv2/imgproc.hpp"
 
 namespace ipo {
 
@@ -46,15 +50,8 @@ cv::Point TwoLineIntersection(const cv::Point &x1_start, const cv::Point &x1_end
                               const cv::Point &x2_start, const cv::Point &x2_end);
 double GetTwoPointAngle(const cv::Point &pt0, const cv::Point &pt1);
 int GetNewRotatedImageSize(const cv::Mat &src, const double &angle, int &width, int &height);
-cv::Mat ImageRotateByCenter(const cv::Mat &src, const double &angle);
+cv::Mat ImageRotateByCenterAndAdjustBoundary(const cv::Mat &src, const double &angle);
 cv::Mat ImageRotate(const cv::Mat &src, const double &angle, const cv::Point &center);
 cv::Mat ImageShift(const cv::Mat &src, const cv::Point2f &from_pt, const cv::Point2f &to_pt);
-
-// cv::Mat PositioningByFeatureMatching(const cv::Mat &golden_sample_img,
-//                                      const cv::Mat sample_img,
-//                                      const cv::Rect &template_rect,
-//                                      const cv::Rect &searching_rect,
-//                                      const int &hessian_threshold,
-//                                      const float &lowe_ratio);
 }  // namespace ipo
 #endif  // _IMAGE_PROC_H_

include/component/positioning.h

@@ -1,6 +1,5 @@
 #ifndef _POSITIONING_H_
 #define _POSITIONING_H_
-#include <memory>
 
 #include "common.h"
 #include "image_proc.h"
@@ -62,6 +61,7 @@ class TemplateMatching : public IPositioning {
   // template <typename T>
   int SetAttribute(const int &attribute_type, const double &value);
   cv::Mat GetResult(const cv::Mat &sample_img);
+  int GG(){};
 
  private:
   //----cv::Rect----
@@ -77,6 +77,7 @@ class TemplateMatching : public IPositioning {
   double similarity_score;
 };
 
+//=========method 1=========
 class Creator {
  public:
   // virtual void Create(const PositioningTypeEnums &type) = 0;
@@ -129,6 +130,26 @@ class Positioning : public Creator {
   IPositioning *ptr;
 };
 
+//=========method 2=========
+// class Creator {
+//  public:
+//   virtual IPositioning *GetInstance(const PositioningTypeEnums &type) = 0;
+// };
+// class Positioning : public Creator {
+//  public:
+//   IPositioning *GetInstance(const PositioningTypeEnums &type) {
+//     switch (type) {
+//       case PositioningTypeEnums::FEATURE_MATCHING: {
+//         return new FeatureMatching();
+//       }
+//       case PositioningTypeEnums::TEMPLATE_MATCHING: {
+//         return new TemplateMatching();
+//       }
+//     }
+//   }
+
+// };
+
 // class Positioning {
 //  public:
 //   static std::shared_ptr<IPositioning> Create(const PositioningTypeEnums &type) {

main.cpp

@@ -15,6 +15,7 @@ cv::Mat &&src = cv::imread("../images/Okonomiyaki.png");
 ------positioning------
 8 : positioning by feature matching(SURF)
 9 : positioning by template matching
+10 : 
 */
 #define index 9
 
@@ -86,6 +87,7 @@ int main() {
   return 0;
 }
 #elif index == 7
+// GetNewRotatedImageSize()
 int main() {
   cv::resize(src, src, cv::Size(), 0.6, 0.6);
 
@@ -99,6 +101,7 @@ int main() {
   return 0;
 }
 #elif index == 8
+// positioning by feature matching(SURF)
 int main() {
   //----Load images----
   cv::Mat &&golden_sample = cv::imread("../images/positioning/golden_sample.jpg");
@@ -125,6 +128,7 @@ int main() {
   cv::waitKey(0);
 }
 #elif index == 9
+// positioning by template matching
 int main() {
   //----Load images----
   cv::Mat &&golden_sample = cv::imread("../images/positioning/golden_sample.jpg");
@@ -152,4 +156,6 @@ int main() {
   cv::imshow("dst", dst);
   cv::waitKey(0);
 }
+#elif index == 10
+
 #endif

src/component/image_proc.cpp

@@ -1,5 +1,6 @@
 #include "component/image_proc.h"
 
+#include "common.h"
 #include "component/positioning.h"
 
 namespace ipo {
@@ -422,10 +423,10 @@ int GetNewRotatedImageSize(const cv::Mat &src,
   return 0;
 }
 
-cv::Mat ImageRotateByCenter(const cv::Mat &src, const double &angle) {
+cv::Mat ImageRotateByCenterAndAdjustBoundary(const cv::Mat &src, const double &angle) {
   // check input images
   if (src.empty()) {
-    std::cout << "\nError: ipo::ImageRotateByCenter() --(cv::Mat)src.empty" << std::endl;
+    std::cout << "\nError: ipo::ImageRotateByCenterAndAdjustBoundary() --(cv::Mat)src.empty" << std::endl;
     return {};
   }
 

src/component/positioning.cpp

@@ -364,7 +364,7 @@ cv::Mat TemplateMatching::GetResult(const cv::Mat &sample_img) {
     height = gray_searching.rows - gray_template.rows + 1;
     result_img = cv::Mat::zeros(width, height, CV_8UC1);
     rotated_gray_searching = cv::Mat::zeros(width, height, CV_8UC1);
-    rotated_gray_searching = ImageRotateByCenter(gray_searching, -current_angle);
+    rotated_gray_searching = ImageRotateByCenterAndAdjustBoundary(gray_searching, -current_angle);
     cv::matchTemplate(rotated_gray_searching, gray_template, result_img, cv::TM_CCOEFF_NORMED);
     cv::minMaxLoc(result_img, &minVal, &maxVal, &minLoc, &maxLoc, cv::noArray());
     if (maxVal > temp_max) {
@@ -377,7 +377,6 @@ cv::Mat TemplateMatching::GetResult(const cv::Mat &sample_img) {
 
   // rotate image
   global_gray_searching = ImageRotate(global_gray_searching, -angle, cv::Point(global_gray_searching.cols / 2, global_gray_searching.rows / 2));
-  cv::imshow("global_gray_searching", global_gray_searching);
   // find global coordinate
   width = global_gray_searching.cols - global_gray_template.cols + 1;
   height = global_gray_searching.rows - global_gray_template.rows + 1;
@@ -388,10 +387,7 @@ cv::Mat TemplateMatching::GetResult(const cv::Mat &sample_img) {
   // result
   cv::Mat &&dst = cv::Mat::zeros(sample_img.size(), sample_img.type());
   dst = sample_img.clone();
-
-  // dst = ImageRotateByCenter(dst, -angle);
   dst = ImageRotate(dst, -angle, cv::Point(dst.cols / 2, dst.rows / 2));
-
   dst = ImageShift(dst, maxLoc, cv::Point(template_rect.x, template_rect.y));
   return dst.clone();
 }