diff --git a/src/MaaCore/Assistant.cpp b/src/MaaCore/Assistant.cpp index c867c7d085..4a9367fbff 100644 --- a/src/MaaCore/Assistant.cpp +++ b/src/MaaCore/Assistant.cpp @@ -481,7 +481,6 @@ void asst::Assistant::call_proc() LogTraceFunction; while (!m_thread_exit) { - AsyncCallItem call_item; { diff --git a/src/MaaCore/Task/Infrast/InfrastProductionTask.cpp b/src/MaaCore/Task/Infrast/InfrastProductionTask.cpp index ab757d1aa3..487a879c5e 100644 --- a/src/MaaCore/Task/Infrast/InfrastProductionTask.cpp +++ b/src/MaaCore/Task/Infrast/InfrastProductionTask.cpp @@ -98,7 +98,6 @@ void asst::InfrastProductionTask::change_product() break; } case infrast::CustomRoomConfig::Product::Dualchip: { - break; } /*贸易站的订单类型*/ diff --git a/src/MaaCore/Task/Infrast/InfrastReceptionTask.cpp b/src/MaaCore/Task/Infrast/InfrastReceptionTask.cpp index 686a683b1b..f8e7572b8c 100644 --- a/src/MaaCore/Task/Infrast/InfrastReceptionTask.cpp +++ b/src/MaaCore/Task/Infrast/InfrastReceptionTask.cpp @@ -6,9 +6,9 @@ #include "Controller/Controller.h" #include "Task/ProcessTask.h" #include "Utils/Logger.hpp" -#include "Vision/MultiMatchImageAnalyzer.h" #include "Vision/Infrast/InfrastClueVacancyImageAnalyzer.h" #include "Vision/MatchImageAnalyzer.h" +#include "Vision/MultiMatchImageAnalyzer.h" bool asst::InfrastReceptionTask::_run() { diff --git a/src/MaaCore/Utils/File.hpp b/src/MaaCore/Utils/File.hpp index 3c6c1a1a13..b311d3a781 100644 --- a/src/MaaCore/Utils/File.hpp +++ b/src/MaaCore/Utils/File.hpp @@ -9,16 +9,17 @@ namespace asst::utils concept ByteValueType = std::is_integral_v && sizeof(ValueType) == 1; template - concept AppendableBytesContainer = requires(ContainerType a) { - requires ranges::contiguous_range; - requires ByteValueType; - requires std::is_constructible_v; - requires std::is_constructible_v; // std::string(count, ch), - // std::vector(count, value) - a.insert(a.end(), a.begin(), a.begin() + (size_t)1); - a.resize(a.size()); - }; + concept AppendableBytesContainer = + requires(ContainerType a) { + requires ranges::contiguous_range; + requires ByteValueType; + requires std::is_constructible_v; + requires std::is_constructible_v; // std::string(count, ch), + // std::vector(count, value) + a.insert(a.end(), a.begin(), a.begin() + (size_t)1); + a.resize(a.size()); + }; template ContainerType read_file(const std::filesystem::path& path) diff --git a/src/MaaCore/Vision/AbstractImageAnalyzer.cpp b/src/MaaCore/Vision/AbstractImageAnalyzer.cpp index 8fb7adaa56..d5816ab062 100644 --- a/src/MaaCore/Vision/AbstractImageAnalyzer.cpp +++ b/src/MaaCore/Vision/AbstractImageAnalyzer.cpp @@ -91,4 +91,3 @@ bool AbstractImageAnalyzer::save_img(const std::filesystem::path& relative_dir) return ret; } - diff --git a/src/MaaCore/Vision/AbstractImageAnalyzer.h b/src/MaaCore/Vision/AbstractImageAnalyzer.h index 56078b7050..6f491c83d4 100644 --- a/src/MaaCore/Vision/AbstractImageAnalyzer.h +++ b/src/MaaCore/Vision/AbstractImageAnalyzer.h @@ -109,5 +109,4 @@ namespace asst return lvalue < rvalue; }); } - } // namespace asst diff --git a/src/MaaCore/Vision/BestMatchImageAnalyzer.h b/src/MaaCore/Vision/BestMatchImageAnalyzer.h index a4d1c7d5ca..46108cf74d 100644 --- a/src/MaaCore/Vision/BestMatchImageAnalyzer.h +++ b/src/MaaCore/Vision/BestMatchImageAnalyzer.h @@ -17,7 +17,8 @@ namespace asst struct Result { std::string to_string() const - { return "{ name: " + templ_info.name + ", matched: " + rect.to_string() + " }"; + { + return "{ name: " + templ_info.name + ", matched: " + rect.to_string() + " }"; } explicit operator std::string() const { return to_string(); } @@ -48,5 +49,4 @@ namespace asst // FIXME: 老接口太难重构了,先弄个这玩意兼容下,后续慢慢全删掉 mutable Result m_result; }; - } diff --git a/src/MaaCore/Vision/Config/MatcherConfig.cpp b/src/MaaCore/Vision/Config/MatcherConfig.cpp index dba484e814..9f9896d0e1 100644 --- a/src/MaaCore/Vision/Config/MatcherConfig.cpp +++ b/src/MaaCore/Vision/Config/MatcherConfig.cpp @@ -44,4 +44,3 @@ void MatcherConfig::_set_task_info(MatchTaskInfo task_info) _set_roi(task_info.roi); } - diff --git a/src/MaaCore/Vision/Config/MatcherConfig.h b/src/MaaCore/Vision/Config/MatcherConfig.h index a5dcd50020..02c606420b 100644 --- a/src/MaaCore/Vision/Config/MatcherConfig.h +++ b/src/MaaCore/Vision/Config/MatcherConfig.h @@ -7,7 +7,6 @@ namespace asst { - class MatcherConfig { public: @@ -41,5 +40,4 @@ namespace asst protected: Params m_params; }; - } diff --git a/src/MaaCore/Vision/Config/OCRerConfig.h b/src/MaaCore/Vision/Config/OCRerConfig.h index 58bbac26a3..8f5ca70bda 100644 --- a/src/MaaCore/Vision/Config/OCRerConfig.h +++ b/src/MaaCore/Vision/Config/OCRerConfig.h @@ -49,5 +49,4 @@ namespace asst protected: Params m_params; }; - } diff --git a/src/MaaCore/Vision/MatchImageAnalyzer.cpp b/src/MaaCore/Vision/MatchImageAnalyzer.cpp index c13e668a64..052e3623a3 100644 --- a/src/MaaCore/Vision/MatchImageAnalyzer.cpp +++ b/src/MaaCore/Vision/MatchImageAnalyzer.cpp @@ -39,7 +39,8 @@ MatchImageAnalyzer::ResultOpt MatchImageAnalyzer::analyze() const return m_result; } -MatchImageAnalyzer::RawResult MatchImageAnalyzer::preproc_and_match(const cv::Mat& image, const MatcherConfig::Params& params) +MatchImageAnalyzer::RawResult MatchImageAnalyzer::preproc_and_match(const cv::Mat& image, + const MatcherConfig::Params& params) { cv::Mat templ; std::string templ_name; @@ -87,4 +88,3 @@ MatchImageAnalyzer::RawResult MatchImageAnalyzer::preproc_and_match(const cv::Ma return RawResult { .matched = matched, .templ = templ, .templ_name = templ_name }; } - diff --git a/src/MaaCore/Vision/MatchImageAnalyzer.h b/src/MaaCore/Vision/MatchImageAnalyzer.h index 8ad8a8fcd4..6cd5162973 100644 --- a/src/MaaCore/Vision/MatchImageAnalyzer.h +++ b/src/MaaCore/Vision/MatchImageAnalyzer.h @@ -3,37 +3,36 @@ #include "Vision/Config/MatcherConfig.h" -namespace asst { - -class MatchImageAnalyzer : public AbstractImageAnalyzer, public MatcherConfig +namespace asst +{ + class MatchImageAnalyzer : public AbstractImageAnalyzer, public MatcherConfig { -public: - using Result = MatchRect; - using ResultOpt = std::optional; + public: + using Result = MatchRect; + using ResultOpt = std::optional; -public: - using AbstractImageAnalyzer::AbstractImageAnalyzer; - virtual ~MatchImageAnalyzer() override = default; + public: + using AbstractImageAnalyzer::AbstractImageAnalyzer; + virtual ~MatchImageAnalyzer() override = default; - ResultOpt analyze() const; - // FIXME: 老接口太难重构了,先弄个这玩意兼容下,后续慢慢全删掉 - const auto& get_result() const noexcept { return m_result; } + ResultOpt analyze() const; + // FIXME: 老接口太难重构了,先弄个这玩意兼容下,后续慢慢全删掉 + const auto& get_result() const noexcept { return m_result; } -public: - struct RawResult - { - cv::Mat matched; - cv::Mat templ; - std::string templ_name; + public: + struct RawResult + { + cv::Mat matched; + cv::Mat templ; + std::string templ_name; + }; + static RawResult preproc_and_match(const cv::Mat& image, const MatcherConfig::Params& params); + + protected: + virtual void _set_roi(const Rect& roi) override { set_roi(roi); } + + private: + // FIXME: 老接口太难重构了,先弄个这玩意兼容下,后续慢慢全删掉 + mutable Result m_result; }; - static RawResult preproc_and_match(const cv::Mat& image, const MatcherConfig::Params& params); - -protected: - virtual void _set_roi(const Rect& roi) override { set_roi(roi); } - -private: - // FIXME: 老接口太难重构了,先弄个这玩意兼容下,后续慢慢全删掉 - mutable Result m_result; -}; - } diff --git a/src/MaaCore/Vision/MultiMatchImageAnalyzer.cpp b/src/MaaCore/Vision/MultiMatchImageAnalyzer.cpp index 6a740c3bd6..abf9f5f180 100644 --- a/src/MaaCore/Vision/MultiMatchImageAnalyzer.cpp +++ b/src/MaaCore/Vision/MultiMatchImageAnalyzer.cpp @@ -77,4 +77,3 @@ MultiMatchImageAnalyzer::ResultsVecOpt MultiMatchImageAnalyzer::analyze() const m_result = std::move(results); return m_result; } - diff --git a/src/MaaCore/Vision/MultiMatchImageAnalyzer.h b/src/MaaCore/Vision/MultiMatchImageAnalyzer.h index ad9d1d3113..3a01ebd45d 100644 --- a/src/MaaCore/Vision/MultiMatchImageAnalyzer.h +++ b/src/MaaCore/Vision/MultiMatchImageAnalyzer.h @@ -2,29 +2,28 @@ #include "AbstractImageAnalyzer.h" #include "Vision/Config/MatcherConfig.h" -namespace asst { - -class MultiMatchImageAnalyzer : public AbstractImageAnalyzer, public MatcherConfig +namespace asst +{ + class MultiMatchImageAnalyzer : public AbstractImageAnalyzer, public MatcherConfig { -public: - using Result = MatchRect; - using ResultsVec = std::vector; - using ResultsVecOpt = std::optional; + public: + using Result = MatchRect; + using ResultsVec = std::vector; + using ResultsVecOpt = std::optional; -public: - using AbstractImageAnalyzer::AbstractImageAnalyzer; - virtual ~MultiMatchImageAnalyzer() override = default; + public: + using AbstractImageAnalyzer::AbstractImageAnalyzer; + virtual ~MultiMatchImageAnalyzer() override = default; - ResultsVecOpt analyze() const; - // FIXME: 老接口太难重构了,先弄个这玩意兼容下,后续慢慢全删掉 - const auto& get_result() const noexcept { return m_result; } + ResultsVecOpt analyze() const; + // FIXME: 老接口太难重构了,先弄个这玩意兼容下,后续慢慢全删掉 + const auto& get_result() const noexcept { return m_result; } -protected: - virtual void _set_roi(const Rect& roi) override { set_roi(roi); } - -private: - // FIXME: 老接口太难重构了,先弄个这玩意兼容下,后续慢慢全删掉 - mutable ResultsVec m_result; -}; + protected: + virtual void _set_roi(const Rect& roi) override { set_roi(roi); } + private: + // FIXME: 老接口太难重构了,先弄个这玩意兼容下,后续慢慢全删掉 + mutable ResultsVec m_result; + }; } diff --git a/src/MaaCore/Vision/OcrImageAnalyzer.h b/src/MaaCore/Vision/OcrImageAnalyzer.h index 1f8ce37635..ad50d7efb8 100644 --- a/src/MaaCore/Vision/OcrImageAnalyzer.h +++ b/src/MaaCore/Vision/OcrImageAnalyzer.h @@ -7,7 +7,6 @@ namespace asst { - class OcrImageAnalyzer : public AbstractImageAnalyzer, public OCRerConfig { public: diff --git a/src/MaaCore/Vision/OcrWithFlagTemplImageAnalyzer.h b/src/MaaCore/Vision/OcrWithFlagTemplImageAnalyzer.h index 230d384e6e..e06dd0bdeb 100644 --- a/src/MaaCore/Vision/OcrWithFlagTemplImageAnalyzer.h +++ b/src/MaaCore/Vision/OcrWithFlagTemplImageAnalyzer.h @@ -43,5 +43,4 @@ namespace asst // FIXME: 老接口太难重构了,先弄个这玩意兼容下,后续慢慢全删掉 mutable ResultsVec m_result; }; - } diff --git a/src/MaaCore/Vision/OcrWithPreprocessImageAnalyzer.cpp b/src/MaaCore/Vision/OcrWithPreprocessImageAnalyzer.cpp index c4b6b9828d..e0eda739a2 100644 --- a/src/MaaCore/Vision/OcrWithPreprocessImageAnalyzer.cpp +++ b/src/MaaCore/Vision/OcrWithPreprocessImageAnalyzer.cpp @@ -45,4 +45,3 @@ OcrWithPreprocessImageAnalyzer::ResultOpt OcrWithPreprocessImageAnalyzer::analyz m_result = result->front(); return m_result; } - diff --git a/src/MaaCore/Vision/OcrWithPreprocessImageAnalyzer.h b/src/MaaCore/Vision/OcrWithPreprocessImageAnalyzer.h index 1e67ca19ac..50f3474fcf 100644 --- a/src/MaaCore/Vision/OcrWithPreprocessImageAnalyzer.h +++ b/src/MaaCore/Vision/OcrWithPreprocessImageAnalyzer.h @@ -24,5 +24,4 @@ namespace asst // FIXME: 老接口太难重构了,先弄个这玩意兼容下,后续慢慢全删掉 mutable Result m_result; }; - }