diff --git a/AlgorithmModule/src/ImageResultJudge.cpp b/AlgorithmModule/src/ImageResultJudge.cpp index c0f069a..e3b9ff9 100644 --- a/AlgorithmModule/src/ImageResultJudge.cpp +++ b/AlgorithmModule/src/ImageResultJudge.cpp @@ -428,6 +428,15 @@ int ImageResultJudge::ResultJudge(std::shared_ptr pImageResult) std::string resultType = "OK"; + + // PIN_PianYi, 不受区域参数控制; + if (!Judge_Status && (config_qx_type == CONFIG_QX_NAME_cell_ZJ_PianYi || config_qx_type == CONFIG_QX_NAME_cell_ZJ_QueShi || config_qx_type == CONFIG_QX_NAME_cell_CGMo_QueShi)) + { + pQxLog->AddCheckstr(PrintLevel_3, "qx info", " ZJ_PianYi | ZJ_QueShi | CGMo_QueShi: region param not used -> report NG by base judge"); + Judge_Status = true; + bNG_Status = true; + } + if (!Judge_Status) { QX_info->result = QX_RESULT_TYPE_NoJduge; diff --git a/AlgorithmModule/src/ImgCheckAnalysisy.cpp b/AlgorithmModule/src/ImgCheckAnalysisy.cpp index 62754e8..45e93d2 100644 --- a/AlgorithmModule/src/ImgCheckAnalysisy.cpp +++ b/AlgorithmModule/src/ImgCheckAnalysisy.cpp @@ -876,7 +876,9 @@ int ImgCheckAnalysisy::CheckRun() m_pdetlog->bPrintStr = true; } // m_pdetlog->bPrintStr = true; - + m_fImgage_Scale_X = m_pBasicConfig->fImage_Scale_x; + m_fImgage_Scale_Y = m_pBasicConfig->fImage_Scale_y; + m_pdetlog->AddCheckstr(PrintLevel_0, "1、basic Info", "---------------------------1、basic Info---------------------------------"); m_pdetlog->AddCheckstr(PrintLevel_0, "Version", "%s", GetVersion().c_str()); m_pdetlog->AddCheckstr(PrintLevel_0, "Updateconfig", "%d", m_bupdateconfig); @@ -1152,6 +1154,11 @@ int ImgCheckAnalysisy::CheckRun() float fDT = fCy - rpRect.y; // 到上边缘 float fDB = (rpRect.y + rpRect.height) - fCy; // 到下边缘 + fDL *= m_fImgage_Scale_X; + fDR *= m_fImgage_Scale_X; + fDT *= m_fImgage_Scale_Y; + fDB *= m_fImgage_Scale_Y; + // 4、按 edge_select 指定方向(left/right/up/down)取计算值,与标准值做差取平均,平均差超过 offset → 偏移 // left/right 用 x_standard,up/down 用 y_standard;offset 用 x_offset float fSumDiff = 0;