From f7b2588bcfe35406fca18de9b8dc0919ec715a8f Mon Sep 17 00:00:00 2001 From: MistEO Date: Fri, 28 Apr 2023 15:14:23 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=94=B9=E4=B8=80=E4=BA=9B=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Assistant.cpp | 3 +-- src/MaaCore/Config/Miscellaneous/OcrPack.cpp | 2 +- src/MaaCore/Vision/Miscellaneous/ProcessTaskImageAnalyzer.cpp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/MaaCore/Assistant.cpp b/src/MaaCore/Assistant.cpp index 314fcccccd..7df8c1a6a5 100644 --- a/src/MaaCore/Assistant.cpp +++ b/src/MaaCore/Assistant.cpp @@ -5,7 +5,6 @@ #include #include "Config/GeneralConfig.h" -#include "Config/Miscellaneous/OcrPack.h" #include "Controller/Controller.h" #include "Status.h" #include "Task/Interface/AwardTask.h" @@ -590,4 +589,4 @@ void Assistant::clear_cache() bool asst::Assistant::inited() const noexcept { return m_ctrler && m_ctrler->inited(); -} \ No newline at end of file +} diff --git a/src/MaaCore/Config/Miscellaneous/OcrPack.cpp b/src/MaaCore/Config/Miscellaneous/OcrPack.cpp index 64b81595de..2a363d6925 100644 --- a/src/MaaCore/Config/Miscellaneous/OcrPack.cpp +++ b/src/MaaCore/Config/Miscellaneous/OcrPack.cpp @@ -118,7 +118,7 @@ asst::OcrPack::ResultsVec asst::OcrPack::recognize(const cv::Mat& image, bool wi auto costs = std::chrono::duration_cast(std::chrono::steady_clock::now() - start_time).count(); std::string class_type = utils::demangle(typeid(*this).name()); - Log.trace(class_type, raw_results, without_det ? "by Rec" : "by Pipeline", ", cost", costs, "ms"); + Log.trace(class_type, raw_results, without_det ? "by OCR Rec" : "by OCR Pipeline", ", cost", costs, "ms"); return raw_results; } diff --git a/src/MaaCore/Vision/Miscellaneous/ProcessTaskImageAnalyzer.cpp b/src/MaaCore/Vision/Miscellaneous/ProcessTaskImageAnalyzer.cpp index 6e4e5d3649..6ede4a44d5 100644 --- a/src/MaaCore/Vision/Miscellaneous/ProcessTaskImageAnalyzer.cpp +++ b/src/MaaCore/Vision/Miscellaneous/ProcessTaskImageAnalyzer.cpp @@ -25,7 +25,7 @@ ProcessTaskImageAnalyzer::ResultOpt ProcessTaskImageAnalyzer::analyze() const continue; } - Log.trace("Pipeline", task_ptr->name); + Log.trace(__FUNCTION__, task_ptr->name); switch (task_ptr->algorithm) { case AlgorithmType::JustReturn: { return Result { .task_ptr = task_ptr };