From 228aed12aeb1eb875aee0a0234fff9f01aff4b00 Mon Sep 17 00:00:00 2001 From: liusiyang Date: Mon, 1 Jun 2026 10:10:38 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=B7=BB=E5=8A=A0=E5=AE=8F=E9=99=90?= =?UTF-8?q?=E5=88=B6=E7=BB=98=E5=9B=BE=EF=BC=8C=5FMAX=5FERROR=5FDOT=5FBLOB?= =?UTF-8?q?=20500->80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AlgorithmModule/include/BlobBase.h | 2 +- AlgorithmModule/include/CheckErrorCodeDefine.hpp | 1 + AlgorithmModule/src/CameraCheckAnalysisy.cpp | 2 ++ AlgorithmModule/src/ImageResultJudge.cpp | 4 ++++ AlgorithmModule/src/ImgCheckAnalysisy.cpp | 4 ++-- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/AlgorithmModule/include/BlobBase.h b/AlgorithmModule/include/BlobBase.h index 9101c86..f321251 100644 --- a/AlgorithmModule/include/BlobBase.h +++ b/AlgorithmModule/include/BlobBase.h @@ -11,7 +11,7 @@ enum ERR_DOT_TYPE_ENUM //-----------------------sxg added #define _MAX_ERROR_SCAN_LINE_PER_ROW 300 -#define _MAX_ERROR_DOT_BLOB 500 +#define _MAX_ERROR_DOT_BLOB 80 #define _MAX_MACRO_COUNT 4 #define _MAX_ERR_CLASS ERR_TYPE_COUNT diff --git a/AlgorithmModule/include/CheckErrorCodeDefine.hpp b/AlgorithmModule/include/CheckErrorCodeDefine.hpp index cf3e4e7..74d66cc 100644 --- a/AlgorithmModule/include/CheckErrorCodeDefine.hpp +++ b/AlgorithmModule/include/CheckErrorCodeDefine.hpp @@ -26,6 +26,7 @@ // resize 图片的 宽度 #define RESIZE_IMAGE_WIDTH 1680 +// #define AI_Time enum TEM_IMG_IDX_ { diff --git a/AlgorithmModule/src/CameraCheckAnalysisy.cpp b/AlgorithmModule/src/CameraCheckAnalysisy.cpp index d6255a1..30c0950 100644 --- a/AlgorithmModule/src/CameraCheckAnalysisy.cpp +++ b/AlgorithmModule/src/CameraCheckAnalysisy.cpp @@ -360,7 +360,9 @@ int CameraCheckAnalysisy::ResultParamJudge() long t1 = CheckUtil::getcurTime(); int re = m_imageResultJudge.MergeResult(m_pCheck_Result->ImageALLDetResultList.at(imgidx), ptemre); long t2 = CheckUtil::getcurTime(); + #ifdef AI_Time m_imageResultJudge.DrawResult(m_pCheck_Result->ImageALLDetResultList.at(imgidx)); + #endif long t3 = CheckUtil::getcurTime(); // m_pdetlog->AddCheckstr(PrintLevel_1, "ResultParamJudge", " det time %ld ms judge %ld draw %ld", t3 - t1, t2 - t1, t3 - t2); diff --git a/AlgorithmModule/src/ImageResultJudge.cpp b/AlgorithmModule/src/ImageResultJudge.cpp index 0cc25cd..5cc73ae 100644 --- a/AlgorithmModule/src/ImageResultJudge.cpp +++ b/AlgorithmModule/src/ImageResultJudge.cpp @@ -571,6 +571,7 @@ int ImageResultJudge::ResultJudge(std::shared_ptr pImageResult) // CheckUtil::printROI(CutRoi, "CutRoi"); cv::Size sz = cv::Size(QX_SAMLLIMG_WIDTH, QX_SAMLLIMG_HEIGHT); + #ifdef AI_Time if (pImageResult->detImg.channels() == 1) { cv::cvtColor(pImageResult->detImg(CutRoi), tem.srcImg, cv::COLOR_GRAY2BGR); @@ -580,6 +581,7 @@ int ImageResultJudge::ResultJudge(std::shared_ptr pImageResult) tem.srcImg = pImageResult->detImg(CutRoi).clone(); } cv::resize(tem.srcImg, tem.resizeImg, sz); + #endif int nqx_type = ConfigTypeToResultType(config_qx_type); tem.type = nqx_type; @@ -814,6 +816,7 @@ int ImageResultJudge::MergeResult(std::shared_ptr pImageResult, cv::Rect CutRoi = GetCutRoi(roi, pImageResult->detImg); cv::Size sz = cv::Size(QX_SAMLLIMG_WIDTH, QX_SAMLLIMG_HEIGHT); + #ifdef AI_Time if (pImageResult->detImg.channels() == 1) { cv::cvtColor(pImageResult->detImg(CutRoi), tem.srcImg, cv::COLOR_GRAY2BGR); @@ -823,6 +826,7 @@ int ImageResultJudge::MergeResult(std::shared_ptr pImageResult, tem.srcImg = pImageResult->detImg(CutRoi).clone(); } cv::resize(tem.srcImg, tem.resizeImg, sz); + #endif int nerrortype = 1; int checkFlage = ANALYSIS_TYPE_TF; diff --git a/AlgorithmModule/src/ImgCheckAnalysisy.cpp b/AlgorithmModule/src/ImgCheckAnalysisy.cpp index 00de3a5..fc12e0c 100644 --- a/AlgorithmModule/src/ImgCheckAnalysisy.cpp +++ b/AlgorithmModule/src/ImgCheckAnalysisy.cpp @@ -3906,7 +3906,7 @@ int ImgCheckAnalysisy::AI_Classify_New(const cv::Mat &src_Img, cv::Rect qx_roi, widt < 220 && fjustarea < 800) { - printf("\n\n\n\n\n\n\n\n\n--------- flenr %f len %d,widt %d,fjustarea %f\n", flenr,len,widt,fjustarea); + // printf("\n\n\n\n\n\n\n\n\n--------- flenr %f len %d,widt %d,fjustarea %f\n", flenr,len,widt,fjustarea); // getchar(); cls_num = AI_CLass_QX_NAME_line; strclassName = "line"; @@ -3918,7 +3918,7 @@ int ImgCheckAnalysisy::AI_Classify_New(const cv::Mat &src_Img, cv::Rect qx_roi, fjustarea < 800 && fjustarea > 20) { - printf("\n\n\n\n\n\n\n\n\n--------- flenr %f len %d,widt %d,fjustarea %f\n", flenr,len,widt,fjustarea); + // printf("\n\n\n\n\n\n\n\n\n--------- flenr %f len %d,widt %d,fjustarea %f\n", flenr,len,widt,fjustarea); // getchar(); cls_num = AI_CLass_QX_NAME_line; strclassName = "line";