From e5fb359e022391185b78a6d8cdb1044833839106 Mon Sep 17 00:00:00 2001 From: liusiyang Date: Mon, 27 Jul 2026 09:54:33 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BD=BF=E7=94=A8=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=85=8D=E7=BD=AEBQ=E6=A3=80=E6=B5=8B=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AlgorithmModule/src/CameraCheckAnalysisy.cpp | 1 - AlgorithmModule/src/ImgCheckAnalysisy.cpp | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/AlgorithmModule/src/CameraCheckAnalysisy.cpp b/AlgorithmModule/src/CameraCheckAnalysisy.cpp index 931c81c..868db5b 100644 --- a/AlgorithmModule/src/CameraCheckAnalysisy.cpp +++ b/AlgorithmModule/src/CameraCheckAnalysisy.cpp @@ -725,7 +725,6 @@ int CameraCheckAnalysisy::preDet_BQ(const cv::Mat &L255CutImg, std::shared_ptrAddCheckstr(PrintLevel_2, "preDet_BQ", "shieldBQ is Open"); cv::Mat detImg_mask = m_pCheck_Result->cameraBaseResult->pEdgeDetResult->shieldMask; for (int i = 0; i < m_pCheck_Result->cameraBaseResult->pBQ_Result->pBQ_roiList.size(); i++) { diff --git a/AlgorithmModule/src/ImgCheckAnalysisy.cpp b/AlgorithmModule/src/ImgCheckAnalysisy.cpp index 8018d9f..e66fde4 100644 --- a/AlgorithmModule/src/ImgCheckAnalysisy.cpp +++ b/AlgorithmModule/src/ImgCheckAnalysisy.cpp @@ -2195,7 +2195,7 @@ int ImgCheckAnalysisy::AI_Detect_BQ() { return 0; } - if (!m_pImageAllResult->cameraBaseResult->pBQ_Result->bBQ_AI_Det) + if (!m_pFuntion->function.f_Det_BQ.bBQ_AI_Det) { return 0; } @@ -2293,7 +2293,7 @@ int ImgCheckAnalysisy::AI_Detect_BQ() m_pdetlog->AddCheckstr(PrintLevel_2, strBaseLog, "BQ small roi num = %d", totalTasks); // 调试存图：原图 + BQ小ROI框 - if (m_pImageAllResult->cameraBaseResult->pBQ_Result->bsaveAll) + if (m_pFuntion->function.f_Det_BQ.bsaveAll) { cv::Mat debugImg; if (AI_detImage.channels() == 1) @@ -2328,7 +2328,7 @@ int ImgCheckAnalysisy::AI_Detect_BQ() task->engine = pAI_Model; // 调试存图：保存每个小块 - if (m_pImageAllResult->cameraBaseResult->pBQ_Result->bsaveAll) + if (m_pFuntion->function.f_Det_BQ.bsaveAll) { cv::imwrite(BQ_save_path +m_strCurDetCamChannel + "_" + std::to_string(submitted) + "_BQ_crop_in.png", task->input); } @@ -2345,7 +2345,7 @@ int ImgCheckAnalysisy::AI_Detect_BQ() if (!outimg.empty()) { // 调试存图：保存模型原始输出mask - if (m_pImageAllResult->cameraBaseResult->pBQ_Result->bsaveAll) + if (m_pFuntion->function.f_Det_BQ.bsaveAll) { cv::imwrite(BQ_save_path + m_strCurDetCamChannel+ "_" + std::to_string(result->id) + "_BQ_crop_out.png", outimg); } @@ -2364,7 +2364,7 @@ int ImgCheckAnalysisy::AI_Detect_BQ() AIresult.copyTo(AIresultMask(srcsize_roi), AIresult); // 调试存图：保存resize后的mask - if (m_pImageAllResult->cameraBaseResult->pBQ_Result->bsaveAll && bResizeToSrc) + if (m_pFuntion->function.f_Det_BQ.bsaveAll && bResizeToSrc) { cv::imwrite(BQ_save_path + m_strCurDetCamChannel + "_BQ_mask_resized_" + std::to_string(result->id) + ".png", AIresult); } @@ -2389,7 +2389,7 @@ int ImgCheckAnalysisy::AI_Detect_BQ() m_pdetlog->AddCheckstr(PrintLevel_1, strBaseLog, "============= End; AI Run Time: sum %ld pre %ld Run %ld mean One Small Img %f", te - ts, t2 - ts, te - t2, mean_AI); // 调试存图 - if (m_pImageAllResult->cameraBaseResult->pBQ_Result->bsaveAll) + if (m_pFuntion->function.f_Det_BQ.bsaveAll) { cv::imwrite(BQ_save_path + m_strCurDetCamChannel + "_AI_BQ_mask.png", pDetAIResult->AI_MaskImg); } @@ -2406,7 +2406,7 @@ int ImgCheckAnalysisy::GetBlob_BQ() { return 0; } - if (!m_pImageAllResult->cameraBaseResult->pBQ_Result->bBQ_AI_Det) + if (!m_pFuntion->function.f_Det_BQ.bBQ_AI_Det) { return 0; }