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

Merge pull request #2220 from MaaAssistantArknights/feat/string_logger

Browse Source 
feat: 更新部分 string() 和 Logger
This commit is contained in:
zzyyyl
2022-10-08 13:35:07 +08:00
committed by GitHub
parent 3e5543f5ef a11ccd50ab
commit c2b1a67a62
5 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/MeoAssistant/ImageAnalyzer/General/MatchImageAnalyzer.cpp
View File

@@ -102,19 +102,19 @@ void asst::MatchImageAnalyzer::set_task_info(MatchTaskInfo task_info) noexcept
bool asst::MatchImageAnalyzer::match_templ(const cv::Mat templ)
{
if (m_roi.x < 0) {
Log.warn("roi is out of range", m_roi.to_string());
Log.warn("roi is out of range", m_roi);
m_roi.x = 0;
}
if (m_roi.y < 0) {
Log.warn("roi is out of range", m_roi.to_string());
Log.warn("roi is out of range", m_roi);
m_roi.y = 0;
}
if (m_roi.x + m_roi.width > m_image.cols) {
Log.warn("roi is out of range", m_roi.to_string());
Log.warn("roi is out of range", m_roi);
m_roi.width = m_image.cols - m_roi.x;
}
if (m_roi.y + m_roi.height > m_image.rows) {
Log.warn("roi is out of range", m_roi.to_string());
Log.warn("roi is out of range", m_roi);
m_roi.height = m_image.rows - m_roi.y;
}
@@ -148,8 +148,7 @@ bool asst::MatchImageAnalyzer::match_templ(const cv::Mat templ)
max_val = 0;
}
if (max_val > m_templ_thres * 0.7) { // 得分太低的肯定不对，没必要打印
Log.trace("match_templ |", m_templ_name, "score:", max_val, "rect:", rect.to_string(),
"roi:", m_roi.to_string());
Log.trace("match_templ |", m_templ_name, "score:", max_val, "rect:", rect, "roi:", m_roi);
}
if (m_templ_thres <= max_val && max_val < 2.0) {

7
src/MeoAssistant/ImageAnalyzer/General/MultiMatchImageAnalyzer.cpp
View File

@@ -157,12 +157,7 @@ bool asst::MultiMatchImageAnalyzer::multi_match_templ(const cv::Mat templ)
}
#endif
std::string log_str = "[ ";
for (const auto& res : m_result) {
log_str += res.rect.to_string() + " : " + std::to_string(res.score) + "; ";
}
log_str += "]";
Log.trace("multi_match_templ | ", m_templ_name, log_str, "roi:", m_roi.to_string());
Log.trace("multi_match_templ | ", m_templ_name, "result:", m_result, "roi:", m_roi);
if (!m_result.empty()) {
return true;

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);
}

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

@@ -38,7 +38,8 @@ namespace asst
Point& operator=(Point&&) noexcept = default;
Point operator-() const noexcept { return { -x, -y }; }
bool operator==(const Point& rhs) const noexcept { return x == rhs.x && y == rhs.y; }
std::string to_string() const { return "[ " + std::to_string(x) + ", " + std::to_string(y) + " ]"; }
std::string to_string() const { return "(" + std::to_string(x) + ", " + std::to_string(y) + ")"; }
explicit operator std::string() const { return to_string(); }
static constexpr Point right() { return { 1, 0 }; }
static constexpr Point down() { return { 0, 1 }; }
static constexpr Point left() { return { -1, 0 }; }
@@ -115,11 +116,11 @@ namespace asst
}
Rect& operator=(const Rect&) noexcept = default;
Rect& operator=(Rect&&) noexcept = default;
bool empty() const noexcept { return width == 0 || height == 0; }
bool operator==(const Rect& rhs) const noexcept
{
return x == rhs.x && y == rhs.y && width == rhs.width && height == rhs.height;
}
bool empty() const noexcept { return width == 0 || height == 0; }
bool include(const Rect& rhs) const noexcept
{
return x <= rhs.x && y <= rhs.y && (x + width) >= (rhs.x + rhs.width) &&
@@ -134,6 +135,7 @@ namespace asst
return "[ " + std::to_string(x) + ", " + std::to_string(y) + ", " + std::to_string(width) + ", " +
std::to_string(height) + " ]";
}
explicit operator std::string() const { return to_string(); }
Rect move(Rect move) const { return { x + move.x, y + move.y, move.width, move.height }; }
int x = 0;
@@ -150,13 +152,16 @@ namespace asst
TextRect(TextRect&&) noexcept = default;
TextRect(double score, const Rect& rect, const std::string& text) : score(score), rect(rect), text(text) {}
explicit operator std::string() const noexcept { return text; }
explicit operator Rect() const noexcept { return rect; }
std::string to_string() const { return text + " : " + rect.to_string() + ", score: " + std::to_string(score); }
TextRect& operator=(const TextRect&) = default;
TextRect& operator=(TextRect&&) noexcept = default;
bool operator==(const TextRect& rhs) const noexcept { return text == rhs.text && rect == rhs.rect; }
bool operator==(const std::string& rhs) const noexcept { return text == rhs; }
explicit operator Rect() const noexcept { return rect; }
std::string to_string() const
{
return "{ " + text + ": " + rect.to_string() + ", score: " + std::to_string(score) + " }";
}
explicit operator std::string() const { return to_string(); }
double score = 0.0;
Rect rect;
@@ -184,6 +189,11 @@ 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: " + rect.to_string() + ", score: " + std::to_string(score) + " }";
}
explicit operator std::string() const { return to_string(); }
double score = 0.0;
Rect rect;

6
src/MeoAssistant/Utils/Logger.hpp
View File

@@ -292,12 +292,12 @@ namespace asst
#endif // END _WIN32
s << buff;
}
else if constexpr (std::convertible_to<T, std::string_view>) {
s << std::forward<T>(v);
}
else if constexpr (has_stream_insertion_operator<Stream, T>) {
s << std::forward<T>(v);
}
else if constexpr (std::constructible_from<std::string, T>) {
s << std::string(std::forward<T>(v));
}
else if constexpr (ranges::input_range<T>) {
s << "[";
std::string_view comma_space {};