From 8610481adb3bdaeb82688bd45046acc57011e42a Mon Sep 17 00:00:00 2001 From: liusiyang Date: Mon, 29 Jun 2026 13:41:07 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=BC=82=E7=89=A9=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AlgorithmModule/src/ImageResultJudge.cpp | 2 ++ AlgorithmModule/src/QX_Merge_Analysis.cpp | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/AlgorithmModule/src/ImageResultJudge.cpp b/AlgorithmModule/src/ImageResultJudge.cpp index f0c0795..81c73d4 100644 --- a/AlgorithmModule/src/ImageResultJudge.cpp +++ b/AlgorithmModule/src/ImageResultJudge.cpp @@ -392,6 +392,8 @@ int ImageResultJudge::ResultJudge(std::shared_ptr pImageResult) { nerrortype = 0; result = true; + bNG_Status = false; + bYS_Status = false; } pQxLog->AddCheckstr(PrintLevel_4, DET_LOG_LEVEL_3, "PolCell_Area_Max", "%s -> %f %s %f ", BOOL_TO_STR(detArea > area_max), detArea, BOOL_TO_ThanLess(detArea > area_max), area_max); diff --git a/AlgorithmModule/src/QX_Merge_Analysis.cpp b/AlgorithmModule/src/QX_Merge_Analysis.cpp index 1ac899b..3702942 100644 --- a/AlgorithmModule/src/QX_Merge_Analysis.cpp +++ b/AlgorithmModule/src/QX_Merge_Analysis.cpp @@ -485,7 +485,7 @@ int QX_Merge_Analysis::Analysis_single_Config(QXAnalysis_Config *pconfig, QX_cha fmaxLen = pqxList->qxList.at(i).length; } // 长度超过阈值 - if (pqxList->qxList.at(i).length > pconfig->len) + if (pconfig->len > 0 && pqxList->qxList.at(i).length > pconfig->len) { blenerror = true; pqxList->qxList.at(i).nqx_type = QX_ERROR_TYPE_Len; @@ -593,7 +593,7 @@ int QX_Merge_Analysis::Analysis_single_Config(QXAnalysis_Config *pconfig, QX_cha { int minidx = -1; - bool bdis = true; + bool bdis = (pconfig->dis > 0); double remindis = 0; // 对距离有要求 if (pconfig->dis > 0) @@ -612,6 +612,11 @@ int QX_Merge_Analysis::Analysis_single_Config(QXAnalysis_Config *pconfig, QX_cha allmindis = pqxList->qxList.at(i).tem_dis; } } + else + { + // 无邻近缺陷，距离检查自动通过 + bdis = false; + } remindis = pqxList->qxList.at(i).tem_dis; }