From ffdd6db39499d8e3108ce7cdf3ccb847270b92f8 Mon Sep 17 00:00:00 2001 From: liusiyang Date: Fri, 11 Sep 2026 14:34:56 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E5=BC=80=E6=94=BEhoverlap=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AlgorithmModule/src/CameraCheckAnalysisy.cpp | 11 +---------- ConfigModule/include/CheckConfigDefine.h | 11 +++++++---- ConfigModule/src/JsonConfig.cpp | 4 ++++ 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/AlgorithmModule/src/CameraCheckAnalysisy.cpp b/AlgorithmModule/src/CameraCheckAnalysisy.cpp index 0ffc870..5939a9a 100644 --- a/AlgorithmModule/src/CameraCheckAnalysisy.cpp +++ b/AlgorithmModule/src/CameraCheckAnalysisy.cpp @@ -213,16 +213,7 @@ int CameraCheckAnalysisy::Detect_Pre() m_pdetlog->AddCheckstr(PrintLevel_1, "Detect_Pre", "Cam %s ==================GetProductFirstRow fail, skip align", strBasic.c_str()); } } - int overlap; - if(pImageResult->result->in_shareImage->strCameraName.find("TA") != std::string::npos) - { - overlap = 1056; - } - else - { - overlap = 1440; - } - + int overlap = cvRound(m_pbaseCheckFunction->markLine.hoverlap); if (img.cols <= overlap) { m_pdetlog->AddCheckstr(PrintLevel_1, "Detect_Pre", "Cam %s ==================img.cols <= overlap %d ", strBasic.c_str(), overlap); diff --git a/ConfigModule/include/CheckConfigDefine.h b/ConfigModule/include/CheckConfigDefine.h index 754c3ac..4d896d0 100644 --- a/ConfigModule/include/CheckConfigDefine.h +++ b/ConfigModule/include/CheckConfigDefine.h @@ -1702,6 +1702,7 @@ struct Base_Function_MarkLine std::vector region; cv::Point mark_local_1; cv::Point mark_local_2; + float hoverlap; Base_Function_MarkLine() { @@ -1715,6 +1716,7 @@ struct Base_Function_MarkLine mark_local_1 = cv::Point(0, 0); mark_local_2 = cv::Point(0, 0); productROI = cv::Rect(0, 0, 0, 0); + hoverlap = 0; region.clear(); } @@ -1727,17 +1729,18 @@ struct Base_Function_MarkLine this->badapt_region = tem.badapt_region; this->mark_local_1 = tem.mark_local_1; this->mark_local_2 = tem.mark_local_2; + this->hoverlap = tem.hoverlap; } void print(std::string str) { - printf("%s>>bOpen %d bDraw %d badapt_region %d mark1 [%d %d] mark2 [%d %d] \n", str.c_str(), - bOpen, bDraw, badapt_region,mark_local_1.x, mark_local_1.y, mark_local_2.x, mark_local_2.y); + printf("%s>>bOpen %d bDraw %d badapt_region %d mark1 [%d %d] mark2 [%d %d] hoverlap %f\n", str.c_str(), + bOpen, bDraw, badapt_region,mark_local_1.x, mark_local_1.y, mark_local_2.x, mark_local_2.y, hoverlap); } std::string GetInfo(std::string str) { char buffer[256]; - sprintf(buffer, "%s>>bOpen %d bDraw %d badapt_region %d mark1 [%d %d] mark2 [%d %d] \n", str.c_str(), - bOpen, bDraw, badapt_region,mark_local_1.x, mark_local_1.y, mark_local_2.x, mark_local_2.y); + sprintf(buffer, "%s>>bOpen %d bDraw %d badapt_region %d mark1 [%d %d] mark2 [%d %d] hoverlap %f\n", str.c_str(), + bOpen, bDraw, badapt_region,mark_local_1.x, mark_local_1.y, mark_local_2.x, mark_local_2.y, hoverlap); std::string str123 = buffer; return str123; } diff --git a/ConfigModule/src/JsonConfig.cpp b/ConfigModule/src/JsonConfig.cpp index cb9ba91..5b6bc35 100644 --- a/ConfigModule/src/JsonConfig.cpp +++ b/ConfigModule/src/JsonConfig.cpp @@ -1168,6 +1168,10 @@ int BaseFuntonConfigJson::GetFunction(Json::Value value) } } } + if (value_f["form"]["ALign_Config"]["hoverlap"]) + { + _config.markLine.hoverlap = value_f["form"]["ALign_Config"]["hoverlap"].asFloat(); + } // _config.markLine.print("dfe"); // getchar(); }