update 不区分黑白缺陷

AlgorithmModule/src/ImageResultJudge.cpp

@@ -271,36 +271,17 @@ int ImageResultJudge::ResultJudge(std::shared_ptr<ImageAllResult> pImageResult)
 						allQxZoning[qx_name].push_back(singleQxZoningInfoTemp);
 					}
 
-					// 黑缺陷
+					// 不区分亮暗缺陷: 参数(阈值)按正数配置; 实测灰阶/能量可能为负, 取绝对值后参与比较
-					if (QX_whiteBLACK == CONFIG_QX_WHITE)
+					int energyAbs = std::abs(energy);
-					{
+					float grayDisAbs = std::abs(grayDis);
-						// pQxLog->AddCheckstr(PrintLevel_3, DET_LOG_LEVEL_3, "param---", "qx :white");
+
-						if (hj >= 0 || Et >= 0)
-						{
-							pQxLog->AddCheckstr(PrintLevel_4, DET_LOG_LEVEL_3, "param ", "Error param idx %d / %d qx white  hj %f and energ %f >0",
-												j + 1, pParam->useNum, hj, Et);
-							continue;
-						}
-						Et = std::abs(Et);
-						hj = std::abs(hj);
-					}
-					else
-					{
-						// pQxLog->AddCheckstr(PrintLevel_3, DET_LOG_LEVEL_3, "param---", "qx :blcak");
-						if (hj < 0 || Et < 0)
-						{
-							pQxLog->AddCheckstr(PrintLevel_4, DET_LOG_LEVEL_3, "param ", "Error param idx %d / %d qx blcak  hj %f and energ %f < 0",
-												j + 1, pParam->useNum, hj, Et);
-							continue;
-						}
-					}
 					Judge_Status = true;
 
 					float detArea = JudgArea;
 
-					if (energy >= Et &&
+					if (energyAbs >= Et &&
 						detArea >= At &&
-						grayDis >= hj &&
+						grayDisAbs >= hj &&
 						flen >= Len &&
 						fbreadth >= Breadth)
 					{
@@ -330,15 +311,15 @@ int ImageResultJudge::ResultJudge(std::shared_ptr<ImageAllResult> pImageResult)
 						pQxLog->AddCheckstr(PrintLevel_4, DET_LOG_LEVEL_3, "Area", "%s -> %f %s %f ",
 											BOOL_TO_STR(detArea >= At), detArea, BOOL_TO_ThanLess(detArea >= At), At);
 					}
-					if (energy < Et)
+					if (energyAbs < Et)
 					{
 						pQxLog->AddCheckstr(PrintLevel_4, DET_LOG_LEVEL_3, "Energy", "%s -> %d %s %f ",
-											BOOL_TO_STR(energy >= Et), energy, BOOL_TO_ThanLess(energy >= Et), Et);
+											BOOL_TO_STR(energyAbs >= Et), energyAbs, BOOL_TO_ThanLess(energyAbs >= Et), Et);
 					}
-					if (grayDis < hj)
+					if (grayDisAbs < hj)
 					{
 						pQxLog->AddCheckstr(PrintLevel_4, DET_LOG_LEVEL_3, "HJ", "%s -> %f %s %f ",
-											BOOL_TO_STR(grayDis >= hj), grayDis, BOOL_TO_ThanLess(grayDis > hj), hj);
+											BOOL_TO_STR(grayDisAbs >= hj), grayDisAbs, BOOL_TO_ThanLess(grayDisAbs > hj), hj);
 					}
 					if (flen < Len)
 					{