From b253c4728368ab9bfa89a7e84dc59217b4bb66e0 Mon Sep 17 00:00:00 2001
From: sun <SJT_sjtu1998@163.con>
Date: Tue, 30 Jul 2019 05:29:18 +0800
Subject: [PATCH] energy changed

---
 energy/src/energy/find/energy_finder.cpp | 29 ++++++++++++++++++------
 energy/src/energy/show/show.cpp          |  1 +
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/energy/src/energy/find/energy_finder.cpp b/energy/src/energy/find/energy_finder.cpp
index 0e398a9..eea8240 100644
--- a/energy/src/energy/find/energy_finder.cpp
+++ b/energy/src/energy/find/energy_finder.cpp
@@ -14,7 +14,10 @@ using std::vector;
 // 此函数用于寻找图像内所有的大风车扇叶
 // ---------------------------------------------------------------------------------------------------------------------
 int Energy::findFans(const cv::Mat src) {
-    if (src.empty())return 0;
+    if (src.empty()){
+        cout << "empty!" << endl;
+        return 0;
+    }
     static Mat src_bin;
     src_bin = src.clone();
     if (src.type() == CV_8UC3) {
@@ -59,7 +62,10 @@ int Energy::findFans(const cv::Mat src) {
 // 此函数用于寻找图像内所有的大风车装甲板模块
 // ---------------------------------------------------------------------------------------------------------------------
 int Energy::findArmors(const cv::Mat src) {
-    if (src.empty())return 0;
+    if (src.empty()){
+        cout << "empty!" << endl;
+        return 0;
+    }
     static Mat src_bin;
     src_bin = src.clone();
     if (src.type() == CV_8UC3) {
@@ -114,7 +120,10 @@ int Energy::findArmors(const cv::Mat src) {
 // 此函数用于寻找图像内大风车中心字母“R”
 // ---------------------------------------------------------------------------------------------------------------------
 bool Energy::findCenterR(const cv::Mat src) {
-    if (src.empty())return false;
+    if (src.empty()){
+        cout << "empty!" << endl;
+        return false;
+    }
     static Mat src_bin;
     src_bin = src.clone();
     if (src.type() == CV_8UC3) {
@@ -163,7 +172,10 @@ bool Energy::findCenterR(const cv::Mat src) {
 // 此函数用于判断找到的矩形候选区是否为含流动条的扇叶
 // ---------------------------------------------------------------------------------------------------------------------
 bool Energy::findFlowStripFan(const cv::Mat src) {
-    if (src.empty())return false;
+    if (src.empty()){
+        cout << "empty!" << endl;
+        return false;
+    }
     static Mat src_bin;
     static Mat src_copy;
     src_bin = src.clone();
@@ -201,9 +213,8 @@ bool Energy::findFlowStripFan(const cv::Mat src) {
     if (flow_strip_fans.empty()) {
         if (show_info)cout << "flow strip fan false!" << endl;
         return false;
-    } else {
-        return true;
     }
+    return true;
 }
 
 
@@ -211,7 +222,10 @@ bool Energy::findFlowStripFan(const cv::Mat src) {
 // 此函数用于寻找流动条
 // ---------------------------------------------------------------------------------------------------------------------
 bool Energy::findFlowStrip(const cv::Mat src) {
-    if (src.empty())return false;
+    if (src.empty()) {
+        cout << "empty!" << endl;
+        return false;
+    }
     cv::Mat src_bin;
     src_bin = src.clone();
 
@@ -296,6 +310,7 @@ bool Energy::findFlowStrip(const cv::Mat src) {
             }
         }
     }
+    return true;
 }
 
 
diff --git a/energy/src/energy/show/show.cpp b/energy/src/energy/show/show.cpp
index 0455ffa..cced0c0 100644
--- a/energy/src/energy/show/show.cpp
+++ b/energy/src/energy/show/show.cpp
@@ -165,6 +165,7 @@ void Energy::showFlowStripFan(std::string windows_name, const cv::Mat src) {
     center_ROI.points(ROI_vertices);   //计算矩形的4个顶点
     for (int i = 0; i < 4; i++)
         line(image2show, ROI_vertices[i], ROI_vertices[(i + 1) % 4], Scalar(0, 0, 255), 2);
+    cout<<"show strip!"<<endl;
     imshow(windows_name, image2show);
 }