feat: wait_freezes draw (#1177)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: MistEO

source/MaaFramework/Task/Component/ActionHelper.cpp

@@ -13,7 +13,7 @@ ActionHelper::ActionHelper(Tasker* tasker)
 {
 }
 
-bool ActionHelper::wait_freezes(const MAA_RES_NS::WaitFreezesParam& param, const cv::Rect& box)
+bool ActionHelper::wait_freezes(const MAA_RES_NS::WaitFreezesParam& param, const cv::Rect& box, const std::string& name)
 {
     if (param.time <= std::chrono::milliseconds(0)) {
         return true;
@@ -65,7 +65,10 @@ bool ActionHelper::wait_freezes(const MAA_RES_NS::WaitFreezesParam& param, const
             return false;
         }
 
-        TemplateComparator comparator(pre_image, cur_image, { roi }, comp_param);
+        std::string draw_name = name.empty() ? "wait_freezes" : std::format("{}_wait_freezes", name);
+        TemplateComparator comparator(pre_image, cur_image, { roi }, comp_param, draw_name);
+
+        VisionBase::save_draws(draw_name, comparator.draws());
 
         if (!comparator.best_result()) {
             pre_image = cur_image;

source/MaaFramework/Task/Component/ActionHelper.h

@@ -13,7 +13,7 @@ class ActionHelper : public NonCopyable
     explicit ActionHelper(Tasker* tasker);
 
     // 等待画面静止
-    bool wait_freezes(const MAA_RES_NS::WaitFreezesParam& param, const cv::Rect& box);
+    bool wait_freezes(const MAA_RES_NS::WaitFreezesParam& param, const cv::Rect& box, const std::string& name = "");
 
     // 根据 target 计算 ROI 区域
     cv::Rect get_target_rect(const MAA_RES_NS::Action::Target& target, const cv::Rect& box = {});

source/MaaFramework/Task/Component/Actuator.cpp

@@ -36,15 +36,15 @@ ActionResult Actuator::run(const cv::Rect& reco_hit, MaaRecoId reco_id, const Pi
         return {};
     }
 
-    wait_freezes(pipeline_data.pre_wait_freezes, reco_hit);
+    wait_freezes(pipeline_data.pre_wait_freezes, reco_hit, pipeline_data.name);
     sleep(pipeline_data.pre_delay);
 
     auto& rt_cache = tasker_->runtime_cache();
     ActionResult result;
 
     for (uint i = 0; i < pipeline_data.repeat; ++i) {
         if (i > 0) {
-            wait_freezes(pipeline_data.repeat_wait_freezes, reco_hit);
+            wait_freezes(pipeline_data.repeat_wait_freezes, reco_hit, pipeline_data.name);
             sleep(pipeline_data.repeat_delay);
         }
 
@@ -61,7 +61,7 @@ ActionResult Actuator::run(const cv::Rect& reco_hit, MaaRecoId reco_id, const Pi
         }
     }
 
-    wait_freezes(pipeline_data.post_wait_freezes, reco_hit);
+    wait_freezes(pipeline_data.post_wait_freezes, reco_hit, pipeline_data.name);
     sleep(pipeline_data.post_delay);
 
     return result;
@@ -559,14 +559,14 @@ ActionResult Actuator::screencap(const MAA_RES_NS::Action::ScreencapParam& param
     };
 }
 
-void Actuator::wait_freezes(const MAA_RES_NS::WaitFreezesParam& param, const cv::Rect& box)
+void Actuator::wait_freezes(const MAA_RES_NS::WaitFreezesParam& param, const cv::Rect& box, const std::string& name)
 {
     if (param.time <= std::chrono::milliseconds(0)) {
         return;
     }
 
     cv::Rect roi = helper_.get_target_rect(param.target, box);
-    helper_.wait_freezes(param, roi);
+    helper_.wait_freezes(param, roi, name);
 }
 
 ActionResult Actuator::start_app(const MAA_RES_NS::Action::AppParam& param, const std::string& name)

source/MaaFramework/Task/Component/Actuator.h

@@ -62,7 +62,7 @@ class Actuator : public NonCopyable
     ActionResult do_nothing(const std::string& name);
     ActionResult stop_task(const std::string& name);
 
-    void wait_freezes(const MAA_RES_NS::WaitFreezesParam& param, const cv::Rect& box);
+    void wait_freezes(const MAA_RES_NS::WaitFreezesParam& param, const cv::Rect& box, const std::string& name);
 
 private:
     MAA_CTRL_NS::ControllerAgent* controller();

source/MaaFramework/Task/Component/Recognizer.cpp

@@ -560,24 +560,8 @@ std::vector<cv::Rect> Recognizer::get_rois_from_pretask(const std::string& name,
 
 void Recognizer::save_draws(const std::string& node_name, const RecoResult& result) const
 {
-    const auto& option = MAA_GLOBAL_NS::OptionMgr::get_instance();
-
-    if (!option.save_draw()) {
-        return;
-    }
-
-    auto dir = option.log_dir() / "vision";
-
-    std::filesystem::create_directories(dir);
-
-    for (const auto& draw : result.draws) {
-        std::string filename = std::format("{}_{}_{}.jpg", format_now_for_filename(), node_name, result.reco_id);
-        auto filepath = dir / path(filename);
-
-        std::ofstream of(filepath, std::ios::out | std::ios::binary);
-        of.write(reinterpret_cast<const char*>(draw.data()), draw.size());
-        LogDebug << "save draw to" << filepath;
-    }
+    std::string name = std::format("{}_{}", node_name, result.reco_id);
+    MAA_VISION_NS::VisionBase::save_draws(name, result.draws);
 }
 
 bool Recognizer::debug_mode() const

source/MaaFramework/Vision/TemplateComparator.cpp

@@ -42,6 +42,11 @@ void TemplateComparator::analyze()
         double score = comp(lhs_roi, rhs_roi, param_.method);
         Result res = Result { .box = roi_, .score = score };
         add_results({ std::move(res) }, param_.threshold);
+
+        if (debug_draw_) {
+            auto draw = draw_result(roi_, score);
+            handle_draw(draw);
+        }
     }
 
     cherry_pick();
@@ -101,4 +106,34 @@ bool TemplateComparator::comp_score(double s1, double s2) const
     return low_score_better_ ? s1 > s2 : s1 < s2;
 }
 
+cv::Mat TemplateComparator::draw_result(const cv::Rect& roi, double score) const
+{
+    int width = image_.cols + rhs_image_.cols;
+    int height = std::max(image_.rows, rhs_image_.rows);
+    cv::Mat draw = cv::Mat::zeros(height, width, image_.type());
+
+    image_.copyTo(draw(cv::Rect(0, 0, image_.cols, image_.rows)));
+    rhs_image_.copyTo(draw(cv::Rect(image_.cols, 0, rhs_image_.cols, rhs_image_.rows)));
+
+    const cv::Scalar roi_color(0, 255, 0);
+    const cv::Scalar score_color(0, 0, 255);
+
+    cv::putText(draw, name_, cv::Point(5, image_.rows - 5), cv::FONT_HERSHEY_SIMPLEX, 1, roi_color, 2);
+
+    cv::rectangle(draw, roi, roi_color, 1);
+    std::string roi_flag = std::format("ROI: [{}, {}, {}, {}]", roi.x, roi.y, roi.width, roi.height);
+    cv::putText(draw, roi_flag, cv::Point(roi.x, roi.y - 5), cv::FONT_HERSHEY_PLAIN, 1.2, roi_color, 1);
+
+    cv::Rect rhs_roi(roi.x + image_.cols, roi.y, roi.width, roi.height);
+    cv::rectangle(draw, rhs_roi, roi_color, 1);
+    cv::putText(draw, roi_flag, cv::Point(rhs_roi.x, rhs_roi.y - 5), cv::FONT_HERSHEY_PLAIN, 1.2, roi_color, 1);
+
+    cv::line(draw, roi.tl(), rhs_roi.tl(), roi_color, 1);
+
+    std::string score_flag = std::format("Score: {:.3f}", score);
+    cv::putText(draw, score_flag, cv::Point(roi.x, roi.y + roi.height + 30), cv::FONT_HERSHEY_SIMPLEX, 1, score_color, 2);
+
+    return draw;
+}
+
 MAA_VISION_NS_END

source/MaaFramework/Vision/TemplateComparator.h

@@ -26,6 +26,8 @@ class TemplateComparator
 private:
     void analyze();
 
+    cv::Mat draw_result(const cv::Rect& roi, double score) const;
+
     void add_results(ResultsVec results, double threshold);
     void cherry_pick();
 

source/MaaFramework/Vision/VisionBase.cpp

@@ -1,9 +1,12 @@
 #include "VisionBase.h"
 
+#include <fstream>
+
 #include "MaaUtils/NoWarningCV.hpp"
 
 #include "Global/OptionMgr.h"
 #include "MaaUtils/Logger.h"
+#include "MaaUtils/Time.hpp"
 #include "VisionUtils.hpp"
 
 MAA_VISION_NS_BEGIN
@@ -73,4 +76,25 @@ void VisionBase::init_draw()
 #endif
 }
 
+void VisionBase::save_draws(const std::string& name, const std::vector<ImageEncodedBuffer>& draws)
+{
+    const auto& option = MAA_GLOBAL_NS::OptionMgr::get_instance();
+
+    if (!option.save_draw()) {
+        return;
+    }
+
+    auto dir = option.log_dir() / "vision";
+    std::filesystem::create_directories(dir);
+
+    for (const auto& draw : draws) {
+        std::string filename = std::format("{}_{}.jpg", format_now_for_filename(), name);
+        auto filepath = dir / path(filename);
+
+        std::ofstream of(filepath, std::ios::out | std::ios::binary);
+        of.write(reinterpret_cast<const char*>(draw.data()), draw.size());
+        LogDebug << "save draw to" << filepath;
+    }
+}
+
 MAA_VISION_NS_END

source/MaaFramework/Vision/VisionBase.h

@@ -48,6 +48,8 @@ class VisionBase
 
     std::vector<ImageEncodedBuffer> draws() && { return std::move(draws_); }
 
+    static void save_draws(const std::string& name, const std::vector<ImageEncodedBuffer>& draws);
+
 protected:
     cv::Mat image_with_roi() const;