fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 18:01:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf: Move some parameters of operator identification to json

Browse Source 
#4993
This commit is contained in:
MistEO
2023-05-30 11:01:47 +08:00
parent bafecb34d2
commit 8c7c4ebe27
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resource/tasks.json
View File

@@ -10069,6 +10069,12 @@
269,
122,
14
],
"specialParams": [
160,
4,
4,
0
]
},
"OperBoxLevelOCR": {

13
src/MaaCore/Vision/Miscellaneous/OperBoxImageAnalyzer.cpp
View File

@@ -62,23 +62,24 @@ bool asst::OperBoxImageAnalyzer::opers_analyze()
{
TemplDetOCRer oper_name_analyzer(m_image);
oper_name_analyzer.set_bin_threshold(160);
oper_name_analyzer.set_bin_expansion(4);
oper_name_analyzer.set_bin_trim_threshold(4, 0);
const auto& params = Task.get("OperBoxNameOCR")->special_params;
oper_name_analyzer.set_bin_threshold(params[0]);
oper_name_analyzer.set_bin_expansion(params[1]);
oper_name_analyzer.set_bin_trim_threshold(params[2], params[3]);
TemplDetOCRer::ResultsVec results;
const auto& replace_task = Task.get<OcrTaskInfo>("CharsNameOcrReplace");
const auto& all_opers = BattleData.get_all_oper_names();
Rect roi_top = Task.get("OperBoxFlagRoleTopROI")->roi;
Rect roi_bottom = Task.get("OperBoxFlagRoleBottomROI")->roi;
for (int i = 1; i < 10; ++i) {
oper_name_analyzer.set_task_info("OperBoxFlagRole" + std::to_string(i), "OperBoxNameOCR");
oper_name_analyzer.set_replace(replace_task->replace_map, replace_task->replace_full);
oper_name_analyzer.set_required(std::vector(all_opers.begin(), all_opers.end()));
oper_name_analyzer.set_roi(roi_top);
auto top_result_opt = oper_name_analyzer.analyze();
if (top_result_opt) {