update 调整关联通道入列位置

AlgorithmModule/src/ImageResultJudge.cpp

@@ -223,6 +223,25 @@ int ImageResultJudge::ResultJudge(std::shared_ptr<ImageAllResult> pImageResult)
 
 		QX_info->result = QX_RESULT_TYPE_NoJduge;
 
+		// 关联通道分析：登记关联过滤源缺陷位置(类型由 analysis_bind.correlated_types 配置, 如脏污/暗点)，
+		// 供 AD 分析判断关联通道是否存在重叠缺陷。
+		// 登记只依赖缺陷类型与位置，与判定结果/是否绘制无关：
+		// 被分到 NoJudge(不判定/Draw)的缺陷也要登记(如 DP 上未开启 AD 判定的暗点)，否则无法过滤其它通道的重叠缺陷
+		if (m_pQX_Merge_Analysis->IsCorrelatedSourceConfigType(config_qx_type))
+		{
+			QX_Merge_Analysis::Correlated_Qx_Info_ corr_qx;
+			corr_qx.channel_name = pImageResult->strChannel;
+			corr_qx.camera_name = pImageResult->cameraBaseResult->strCameraName;
+			corr_qx.config_qx_type = config_qx_type;
+			corr_qx.result_type = ConfigTypeToResultType(config_qx_type);
+			corr_qx.product_roi = roi;
+			corr_qx.product_roi.x += fproduct_offx_piexl;
+
+			bool bAddCorr = m_pQX_Merge_Analysis->AddCorrelatedQxInfo(corr_qx, pQxLog);
+			pQxLog->AddCheckstr(PrintLevel_2, DET_LOG_LEVEL_3, " Use  Num And Dis Judge ", "qx %s ,Add Correlated %s   %s",
+								qx_name.c_str(), BOOL_TO_STR_Error(bAddCorr), corr_qx.GetInfo().c_str());
+		}
+
 		// 在其他位置已经判断了 不进入分析。直接绘制。
 		if (qx_status == QX_Stauts_Draw)
 		{
@@ -746,23 +765,6 @@ int ImageResultJudge::ResultJudge(std::shared_ptr<ImageAllResult> pImageResult)
 					pQxLog->AddCheckstr(PrintLevel_2, DET_LOG_LEVEL_3, " Use  Num And Dis Judge ", "qx %s ,Add  %s   %s", qx_name.c_str(), BOOL_TO_STR_Error(bad), CheckUtil::getCurTimeHMS().c_str());
 				}
 			}
-
-			// 关联通道分析：登记关联过滤源缺陷位置(类型由 analysis_bind.correlated_types 配置, 如脏污/暗点)，
-			// 供 AD 分析判断关联通道是否存在重叠缺陷
-			if (m_pQX_Merge_Analysis->IsCorrelatedSourceConfigType(config_qx_type))
-			{
-				QX_Merge_Analysis::Correlated_Qx_Info_ corr_qx;
-				corr_qx.channel_name = pImageResult->strChannel;
-				corr_qx.camera_name = pImageResult->cameraBaseResult->strCameraName;
-				corr_qx.config_qx_type = config_qx_type;
-				corr_qx.result_type = ConfigTypeToResultType(config_qx_type);
-				corr_qx.product_roi = roi;
-				corr_qx.product_roi.x += fproduct_offx_piexl;
-
-				bool bAddCorr = m_pQX_Merge_Analysis->AddCorrelatedQxInfo(corr_qx, pQxLog);
-				pQxLog->AddCheckstr(PrintLevel_2, DET_LOG_LEVEL_3, " Use  Num And Dis Judge ", "qx %s ,Add Correlated %s   %s",
-									qx_name.c_str(), BOOL_TO_STR_Error(bAddCorr), corr_qx.GetInfo().c_str());
-			}
 		}
 
 		pQxLog->AddCheckstr(PrintLevel_2, DET_LOG_LEVEL_3, " Cur Result ", "qx %s ,result = %s", qx_name.c_str(), resultType.c_str());