diff --git a/AlgorithmModule/src/ImageResultJudge.cpp b/AlgorithmModule/src/ImageResultJudge.cpp index 0a15846..9d1a722 100644 --- a/AlgorithmModule/src/ImageResultJudge.cpp +++ b/AlgorithmModule/src/ImageResultJudge.cpp @@ -415,6 +415,7 @@ int ImageResultJudge::ResultJudge(std::shared_ptr pImageResult) Judge_Status = true; checkFlage = ANALYSIS_TYPE_TF; nerrortype = 1; + bNG_Status = true; } } // 暗点 3S 分析 对 好品 或者 是 疑是的缺陷进行3S分析。S数量分析。 3S的暗点直接NG. diff --git a/AlgorithmModule/src/ImgCheckAnalysisy.cpp b/AlgorithmModule/src/ImgCheckAnalysisy.cpp index 9d05963..c594317 100644 --- a/AlgorithmModule/src/ImgCheckAnalysisy.cpp +++ b/AlgorithmModule/src/ImgCheckAnalysisy.cpp @@ -589,6 +589,7 @@ int ImgCheckAnalysisy::SetNewConfig() m_pRegionAnalysisyParam = &m_pCommonAnalysisyConfig->regionConfigArr.at(0); GetParamidx(); UpdateImgageScale(); + UPdateLDConfig(); if (true) { printf("SetNewConfig m_nConfigIdx %d m_CheckConfig.strSkuName %s \n", m_nConfigIdx, m_AnalysisyConfig.strSkuName.c_str()); @@ -3356,17 +3357,17 @@ int ImgCheckAnalysisy::BLobToDetResult() config_qx_type == CONFIG_QX_NAME_Other || config_qx_type == CONFIG_QX_NAME_LD) { - std::string qx_name = CONFIG_QX_NAME_Names[config_qx_type]; + qx_name = CONFIG_QX_NAME_Names[config_qx_type]; // m_TemCheck.AddCheckstr(PrintLevel_3, DET_LOG_LEVEL_3, "LD", "stsrt config_qx_type %s ", qx_name.c_str()); int dbresult = LDJudge(config_qx_type, roi, JudgArea, blobs.blobTab[i].maxValue, blobs.blobTab[i].grayDis, pQxlog); - int detre = 1; + //int detre = 1; // 表示L0 和 DP 都有的 亮的 if (dbresult == 1) { config_qx_type = CONFIG_QX_NAME_LD; qx_name = CONFIG_QX_NAME_Names[config_qx_type]; } - pQxlog->AddCheckstr(PrintLevel_2, DET_LOG_LEVEL_3, " LD Judge ", "%s qx %s ", Re_TO_STR_False(detre), qx_name.c_str()); + pQxlog->AddCheckstr(PrintLevel_2, DET_LOG_LEVEL_3, " LD Judge ", "%s qx %s ", Re_TO_STR_Pass_1(dbresult), qx_name.c_str()); } // 如果是chess 画面,缺陷类型直接是chess异常。 if (m_pFuntion->function.f_AIQX.bAllToChess) @@ -3450,7 +3451,7 @@ int ImgCheckAnalysisy::BLobToDetResult() bool ban = JudgeQXAnalysis(config_qx_type, pQxlog); if (!ban) { - std::string qx_name = CONFIG_QX_NAME_Names[config_qx_type]; + qx_name = CONFIG_QX_NAME_Names[config_qx_type]; pQxlog->AddCheckstr(PrintLevel_2, DET_LOG_LEVEL_3, "Judge QX", "qx function close, config_qx_type %s Not Det", qx_name.c_str()); @@ -3467,7 +3468,7 @@ int ImgCheckAnalysisy::BLobToDetResult() isMarksheildQX = Judge_MarkLine_QX(config_qx_type, roi, pQxlog); if (isMarksheildQX) { - std::string qx_name = CONFIG_QX_NAME_Names[config_qx_type]; + qx_name = CONFIG_QX_NAME_Names[config_qx_type]; pQxlog->AddCheckstr(PrintLevel_2, DET_LOG_LEVEL_3, "MarkLine_QX", "MarkLine_QX close, config_qx_type %s Not Det", qx_name.c_str()); diff --git a/ConfigModule/include/CheckConfigDefine.h b/ConfigModule/include/CheckConfigDefine.h index 11497a5..e9251d9 100644 --- a/ConfigModule/include/CheckConfigDefine.h +++ b/ConfigModule/include/CheckConfigDefine.h @@ -85,7 +85,7 @@ static std::vector CONFIG_QX_NAME_Names = "Broken_line", "zara", "MTX", - "Pol_Cell", + "POL_Cell", "LD", "AD", "Scratch_L1",