From ac58c6bc42536bb15d60f0ae6609077113119910 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Mon, 27 Sep 2021 15:33:38 +0800
Subject: [PATCH] =?UTF-8?q?feat.=E6=96=B0=E5=A2=9E=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E8=AF=86=E5=88=ABROI=E5=8C=BA=E5=9F=9F=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/tasks.json                       |  6 ++
 src/MeoAssistance/AsstDef.h               | 13 +++-
 src/MeoAssistance/InfrastAbstractTask.cpp | 10 +--
 src/MeoAssistance/ProcessTask.cpp         | 74 +++++++++++++++++------
 src/MeoAssistance/TaskConfiger.cpp        |  1 +
 5 files changed, 75 insertions(+), 29 deletions(-)

diff --git a/resource/tasks.json b/resource/tasks.json
index eda56be4cd..f2e285d98e 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -318,6 +318,12 @@
         "text": [
             "信用交易所"
         ],
+        "identifyArea": [
+            1000,
+            0,
+            280,
+            300
+        ],
         "rearDelay": 1000,
         "action": "clickSelf",
         "next": [
diff --git a/src/MeoAssistance/AsstDef.h b/src/MeoAssistance/AsstDef.h
index 0589c09e3a..84324023b8 100644
--- a/src/MeoAssistance/AsstDef.h
+++ b/src/MeoAssistance/AsstDef.h
@@ -58,12 +58,17 @@ namespace asst {
 		{
 			return { x, y, static_cast<int>(width * rhs), static_cast<int>(height * rhs) };
 		}
-		Rect center_zoom(double scale) const
+		Rect center_zoom(double scale, int max_width = INT_MAX, int max_height = INT_MAX) const
 		{
 			int half_width_scale = static_cast<int>(width * (1 - scale) / 2);
 			int half_hight_scale = static_cast<int>(height * (1 - scale) / 2);
-			return { x + half_width_scale, y + half_hight_scale,
-				static_cast<int>(width * scale),  static_cast<int>(height * scale) };
+			Rect dst(x + half_width_scale, y + half_hight_scale,
+				static_cast<int>(width * scale), static_cast<int>(height * scale));
+			if (dst.x < 0) { dst.x = 0; }
+			if (dst.y < 0) { dst.y = 0; }
+			if (dst.width + dst.x >= max_width) { dst.width = max_width - dst.x; }
+			if (dst.height + dst.y >= max_height) { dst.height = max_height - dst.y; }
+			return dst;
 		}
 		Rect& operator=(const Rect&) noexcept = default;
 		Rect& operator=(Rect&&) noexcept = default;
@@ -145,6 +150,8 @@ namespace asst {
 		bool need_match = false;						// 是否需要全匹配，否则搜索到子串就算匹配上了
 		std::unordered_map<std::string, std::string>
 			replace_map;								// 部分文字容易识别错，字符串强制replace之后，再进行匹配
+		bool cache = false;								// 是否使用缓存区域：上次处理该任务时，在一些rect里识别到过text，这次优先在这些rect里识别，省点性能
+		std::vector<Rect> cache_area;					// 识别缓存区域
 	};
 
 	// 图片匹配任务的信息
diff --git a/src/MeoAssistance/InfrastAbstractTask.cpp b/src/MeoAssistance/InfrastAbstractTask.cpp
index be130de386..803acef723 100644
--- a/src/MeoAssistance/InfrastAbstractTask.cpp
+++ b/src/MeoAssistance/InfrastAbstractTask.cpp
@@ -226,15 +226,7 @@ std::vector<TextArea> asst::InfrastAbstractTask::detect_operators_name(
 			if (textarea.text.find(key) != std::string::npos
 				&& textarea.text.find(value) == std::string::npos) {
 				// 把key所在的矩形放大一点送去做特征检测，不需要把整张图片都送去检测
-				Rect magnified_area = textarea.rect.center_zoom(2.0);
-				magnified_area.x = (std::max)(0, magnified_area.x);
-				magnified_area.y = (std::max)(0, magnified_area.y);
-				if (magnified_area.x + magnified_area.width >= image.cols) {
-					magnified_area.width = image.cols - magnified_area.x - 1;
-				}
-				if (magnified_area.y + magnified_area.height >= image.rows) {
-					magnified_area.height = image.rows - magnified_area.y - 1;
-				}
+				Rect magnified_area = textarea.rect.center_zoom(2.0, image.cols, image.rows);
 				// key是关键字而已，真正要识别的是value
 				auto&& ret = OcrAbstractTask::m_identify_ptr->feature_match(
 					image(make_rect<cv::Rect>(magnified_area)), value);
diff --git a/src/MeoAssistance/ProcessTask.cpp b/src/MeoAssistance/ProcessTask.cpp
index 00db9c0ba3..36b436e5b7 100644
--- a/src/MeoAssistance/ProcessTask.cpp
+++ b/src/MeoAssistance/ProcessTask.cpp
@@ -200,31 +200,71 @@ std::shared_ptr<TaskInfo> ProcessTask::match_image(Rect* matched_rect)
 		{
 			std::shared_ptr<OcrTaskInfo> ocr_task_info_ptr =
 				std::dynamic_pointer_cast<OcrTaskInfo>(task_info_ptr);
-			cv::Mat identify_image;
-			const auto& identify_area = m_controller_ptr->shaped_correct(task_info_ptr->identify_area);
-			if (identify_area.width == 0) {
-				identify_image = cur_image;
-			}
-			else {
-				identify_image = cur_image(make_rect<cv::Rect>(identify_area));
-			}
-			std::vector<TextArea> all_text_area = ocr_detect(identify_image);
+
 			std::vector<TextArea> match_result;
-			if (ocr_task_info_ptr->need_match) {
-				match_result = text_match(all_text_area,
-					ocr_task_info_ptr->text, ocr_task_info_ptr->replace_map);
+			auto identify_roi = [&](const cv::Mat& roi) -> bool {
+				std::vector<TextArea> all_text_area = ocr_detect(roi);
+				if (ocr_task_info_ptr->need_match) {
+					match_result = text_match(all_text_area,
+						ocr_task_info_ptr->text, ocr_task_info_ptr->replace_map);
+				}
+				else {
+					match_result = text_search(all_text_area,
+						ocr_task_info_ptr->text, ocr_task_info_ptr->replace_map);
+				}
+				if (!match_result.empty()) {
+					return true;
+				}
+				else {
+					return false;
+				}
+			};
+
+			// 先在缓存的区域里识别
+			Rect roi_area;
+			for (const auto& cache_area : ocr_task_info_ptr->cache_area) {
+				Rect roi_rect = cache_area.center_zoom(2.0, Configer::WindowWidthDefault, Configer::WindowHeightDefault);
+				cv::Mat roi_image = cur_image(make_rect<cv::Rect>(roi_rect));
+				if (identify_roi(roi_image)) {
+					roi_area = roi_rect;
+					callback_json["algorithm"] = "OcrDetectRoi";
+					callback_json["roi"] = make_rect<json::array>(roi_rect);
+					break;
+				}
 			}
-			else {
-				match_result = text_search(all_text_area,
-					ocr_task_info_ptr->text, ocr_task_info_ptr->replace_map);
+			// 如果缓存的区域里没识别到，那再在用完整的/默认区域识别一次
+			if (match_result.empty()) {
+				const auto& identify_area = m_controller_ptr->shaped_correct(ocr_task_info_ptr->identify_area);
+				if (identify_area.width == 0) {
+					if (identify_roi(cur_image)) {
+						roi_area = Rect(0, 0, cur_image.cols, cur_image.rows);
+					}
+				}
+				else {
+					cv::Mat roi_image = cur_image(make_rect<cv::Rect>(identify_area));
+					if (identify_roi(roi_image)) {
+						roi_area = identify_area;
+					}
+				}
+				// 把本次识别到的区域加入到缓存里
+				if (ocr_task_info_ptr->cache) {
+					for (const auto& textarea : match_result) {
+						Rect cache_area = textarea.rect;
+						cache_area.x += roi_area.x;
+						cache_area.y += roi_area.y;
+						ocr_task_info_ptr->cache_area.emplace_back(std::move(cache_area));
+					}
+				}
+				callback_json["algorithm"] = "OcrDetect";
 			}
+
 			// TODO：如果搜出来多个结果，怎么处理？
 			// 暂时通过配置文件，保证尽量只搜出来一个结果or一个都搜不到
 			if (!match_result.empty()) {
 				callback_json["text"] = match_result.at(0).text;
 				rect = match_result.at(0).rect;
-				rect.x += identify_area.x;
-				rect.y += identify_area.y;
+				rect.x += roi_area.x;
+				rect.y += roi_area.y;
 				matched = true;
 			}
 		}
diff --git a/src/MeoAssistance/TaskConfiger.cpp b/src/MeoAssistance/TaskConfiger.cpp
index 01ca67d81c..a55646cb7e 100644
--- a/src/MeoAssistance/TaskConfiger.cpp
+++ b/src/MeoAssistance/TaskConfiger.cpp
@@ -99,6 +99,7 @@ bool asst::TaskConfiger::parse(const json::value& json)
 					ocr_task_info_ptr->replace_map.emplace(key, value.as_string());
 				}
 			}
+			ocr_task_info_ptr->cache = task_json.get("cache", true);
 			task_info_ptr = ocr_task_info_ptr;
 		}
 		break;