fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 02:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf: 继续优化

Browse Source
This commit is contained in:
zzyyyl
2022-10-08 00:23:27 +08:00
parent 40ecedaf74
commit 9b1d960334
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/MeoAssistant/Resource/OcrPack.cpp
View File

@@ -105,8 +105,7 @@ std::vector<asst::TextRect> asst::OcrPack::recognize(const cv::Mat& image, const
}
std::vector<TextRect> result;
std::string log_str_raw;
std::string log_str_proc;
std::vector<TextRect> raw_result;
#ifdef ASST_DEBUG
cv::Mat draw = image.clone();
@@ -121,10 +120,8 @@ std::vector<asst::TextRect> asst::OcrPack::recognize(const cv::Mat& image, const
int* box = m_boxes_buffer + i * 8;
int x_collect[4] = { *(box + 0), *(box + 2), *(box + 4), *(box + 6) };
int y_collect[4] = { *(box + 1), *(box + 3), *(box + 5), *(box + 7) };
int left = static_cast<int>(*std::min_element(x_collect, x_collect + 4));
int right = static_cast<int>(*std::max_element(x_collect, x_collect + 4));
int top = static_cast<int>(*std::min_element(y_collect, y_collect + 4));
int bottom = static_cast<int>(*std::max_element(y_collect, y_collect + 4));
auto [left, right] = ranges::minmax(x_collect);
auto [top, bottom] = ranges::minmax(y_collect);
rect = Rect(left, top, right - left, bottom - top);
}
std::string text(*(m_strs_buffer + i));
@@ -137,15 +134,14 @@ std::vector<asst::TextRect> asst::OcrPack::recognize(const cv::Mat& image, const
#ifdef ASST_DEBUG
cv::rectangle(draw, utils::make_rect<cv::Rect>(rect), cv::Scalar(0, 0, 255), 2);
#endif
log_str_raw += tr.to_string() + ", ";
raw_result.emplace_back(tr);
if (!pred || pred(tr)) {
log_str_proc += tr.to_string() + ", ";
result.emplace_back(std::move(tr));
}
}
Log.trace("OcrPack::recognize | raw : ", log_str_raw);
Log.trace("OcrPack::recognize | proc : ", log_str_proc);
Log.trace("OcrPack::recognize | raw:", raw_result);
Log.trace("OcrPack::recognize | proc:", result);
return result;
}
@@ -162,7 +158,7 @@ std::vector<asst::TextRect> asst::OcrPack::recognize(const cv::Mat& image, const
}
return pred(tr);
};
Log.trace("OcrPack::recognize | roi : ", roi.to_string());
Log.trace("OcrPack::recognize | roi:", roi);
cv::Mat roi_img = image(utils::make_rect<cv::Rect>(roi));
return recognize(roi_img, rect_cor, without_det);
}

7
src/MeoAssistant/Utils/AsstTypes.h
View File

@@ -159,7 +159,7 @@ namespace asst
explicit operator Rect() const noexcept { return rect; }
std::string to_string() const
{
return "[ " + text + " : " + rect.to_string() + ", score: " + std::to_string(score) + " ]";
return "{ " + text + ": " + rect.to_string() + ", score: " + std::to_string(score) + " }";
}
explicit operator std::string() const { return to_string(); }
@@ -189,7 +189,10 @@ namespace asst
explicit operator Rect() const noexcept { return rect; }
MatchRect& operator=(const MatchRect&) = default;
MatchRect& operator=(MatchRect&&) noexcept = default;
std::string to_string() const { return "[ " + rect.to_string() + ", score: " + std::to_string(score) + " ]"; }
std::string to_string() const
{
return "{ rect: " + rect.to_string() + ", score: " + std::to_string(score) + " }";
}
explicit operator std::string() const { return to_string(); }
double score = 0.0;