From 33f9d8d73f4e33cfff2c219484acd9a4d1e55b3f Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Wed, 8 Sep 2021 23:03:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B9=B2=E5=91=98=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB=E4=B8=AD=EF=BC=8C=E6=B6=82=E9=BB=91=E5=B9=B2=E5=91=98?=
 =?UTF-8?q?=E5=90=8D=E6=B6=82=E9=94=99=E4=BA=86=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MeoAssistance/AsstCaller.cpp       |  9 +++++++++
 MeoAssistance/IdentifyOperTask.cpp | 17 +++++++++--------
 include/AsstCaller.h               |  1 +
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/MeoAssistance/AsstCaller.cpp b/MeoAssistance/AsstCaller.cpp
index 2606246848..b349745abe 100644
--- a/MeoAssistance/AsstCaller.cpp
+++ b/MeoAssistance/AsstCaller.cpp
@@ -122,6 +122,15 @@ bool AsstStartInfrast(asst::Assistance* p_asst)
 	return true;
 }
 
+MEOAPI_PORT bool AsstStartIndertifyOpers(asst::Assistance* p_asst)
+{
+	if (p_asst == NULL) {
+		return false;
+	}
+	p_asst->start_to_identify_opers();
+	return true;
+}
+
 bool AsstDebugTask(asst::Assistance* p_asst)
 {
 	if (p_asst == NULL) {
diff --git a/MeoAssistance/IdentifyOperTask.cpp b/MeoAssistance/IdentifyOperTask.cpp
index dc26bb30fe..0e3a5e294d 100644
--- a/MeoAssistance/IdentifyOperTask.cpp
+++ b/MeoAssistance/IdentifyOperTask.cpp
@@ -159,6 +159,7 @@ std::vector<TextArea> asst::IdentifyOperTask::detect_opers(
 	int cropped_height = image.rows * m_cropped_height_ratio;
 	int cropped_upper_y = image.rows * m_cropped_upper_y_ratio;
 	cv::Mat upper_part_name_image = image(cv::Rect(0, cropped_upper_y, image.cols, cropped_height));
+	// ocr库，单色图片识别效果好很多；但是只接受三通道的图片，所以这里转两次，送进去单色的、三通道的图片
 	cv::cvtColor(upper_part_name_image, upper_part_name_image, cv::COLOR_BGR2GRAY);
 	cv::cvtColor(upper_part_name_image, upper_part_name_image, cv::COLOR_GRAY2BGR);
 
@@ -173,16 +174,16 @@ std::vector<TextArea> asst::IdentifyOperTask::detect_opers(
 		InfrastConfiger::get_instance().m_all_opers_name,
 		Configer::get_instance().m_infrast_ocr_replace);
 	// 把这一块涂黑，避免后面被特征检测的误识别了
-	cv::Mat draw_image = image;
 	for (const TextArea& textarea : upper_part_names) {
-		cv::Rect rect(textarea.rect.x, textarea.rect.y, textarea.rect.width, textarea.rect.height);
-		// 注意这里是浅拷贝，原图image也会被涂黑
-		cv::rectangle(draw_image, rect, cv::Scalar(0, 0, 0), -1);
+		cv::Rect rect(textarea.rect.x, textarea.rect.y - cropped_upper_y, textarea.rect.width, textarea.rect.height);
+		// 这里是转过灰度图再转回来的，相当于深拷贝，不会影响原图
+		cv::rectangle(upper_part_name_image, rect, cv::Scalar(0, 0, 0), -1);
 	}
 
 	// 下半部分的干员
 	int cropped_lower_y = image.rows * m_cropped_lower_y_ratio;
 	cv::Mat lower_part_name_image = image(cv::Rect(0, cropped_lower_y, image.cols, cropped_height));
+	// ocr库，单色图片识别效果好很多；但是只接受三通道的图片，所以这里转两次，送进去单色的、三通道的图片
 	cv::cvtColor(lower_part_name_image, lower_part_name_image, cv::COLOR_BGR2GRAY);
 	cv::cvtColor(lower_part_name_image, lower_part_name_image, cv::COLOR_GRAY2BGR);
 
@@ -198,9 +199,9 @@ std::vector<TextArea> asst::IdentifyOperTask::detect_opers(
 		Configer::get_instance().m_infrast_ocr_replace);
 	// 把这一块涂黑，避免后面被特征检测的误识别了
 	for (const TextArea& textarea : lower_part_names) {
-		cv::Rect rect(textarea.rect.x, textarea.rect.y, textarea.rect.width, textarea.rect.height);
-		// 注意这里是浅拷贝，原图image也会被涂黑
-		cv::rectangle(draw_image, rect, cv::Scalar(0, 0, 0), -1);
+		cv::Rect rect(textarea.rect.x, textarea.rect.y - cropped_lower_y, textarea.rect.width, textarea.rect.height);
+		// 这里是转过灰度图再转回来的，相当于深拷贝，不会影响原图
+		cv::rectangle(lower_part_name_image, rect, cv::Scalar(0, 0, 0), -1);
 	}
 
 	// 上下两部分识别结果合并
@@ -273,7 +274,7 @@ std::vector<TextArea> asst::IdentifyOperTask::detect_opers(
 					}
 					// 顺便再涂黑了，避免后面被whatever特征检测的误识别
 					// 注意这里是浅拷贝，原图image也会被涂黑
-					cv::rectangle(draw_image, cv_rect, cv::Scalar(0, 0, 0), -1);
+					//cv::rectangle(draw_image, cv_rect, cv::Scalar(0, 0, 0), -1);
 				}
 			}
 		}
diff --git a/include/AsstCaller.h b/include/AsstCaller.h
index 98c4394244..897fff7e09 100644
--- a/include/AsstCaller.h
+++ b/include/AsstCaller.h
@@ -19,6 +19,7 @@ extern "C" {
 	MEOAPI_PORT bool AsstSetParam(asst::Assistance* p_asst, const char* type, const char* param, const char* value);
 	MEOAPI_PORT bool AsstRunOpenRecruit(asst::Assistance* p_asst, const int required_level[], int required_len, bool set_time);
 	MEOAPI_PORT bool AsstStartInfrast(asst::Assistance* p_asst);
+	MEOAPI_PORT bool AsstStartIndertifyOpers(asst::Assistance* p_asst);
 	MEOAPI_PORT bool AsstDebugTask(asst::Assistance* p_asst);
 
 	MEOAPI_PORT bool CheckVersionUpdate(char* tag_buffer, int tag_bufsize, char* html_url_buffer, int html_bufsize, char* body_buffer, int body_bufsize);