diff --git a/AlgorithmModule/src/ImageResultJudge.cpp b/AlgorithmModule/src/ImageResultJudge.cpp index 95366ba..5b4bf8d 100644 --- a/AlgorithmModule/src/ImageResultJudge.cpp +++ b/AlgorithmModule/src/ImageResultJudge.cpp @@ -433,11 +433,6 @@ int ImageResultJudge::ResultJudge(std::shared_ptr pImageResult) } } // 暗点 3S 分析 对 好品 或者 是 疑是的缺陷进行3S分析。S数量分析。 3S的暗点直接NG. - // if ((nerrortype == 0 || checkFlage != ANALYSIS_TYPE_TF) && - // config_qx_type == CONFIG_QX_NAME_AD && pFuntion && - // pFuntion->function.f_AD_Check.bOpen && - // pFuntion->function.f_AD_Check.analysis_s.bOpen && - // pFuntion->function.f_AD_Check.analysis_s.NG_3s && bpreSucc) if ((nerrortype == 0 || checkFlage != ANALYSIS_TYPE_TF) && config_qx_type == CONFIG_QX_NAME_AD && pFuntion != NULL && m_pbaseCheckFunction && m_pbaseCheckFunction->ad_check.bOpen && diff --git a/ConfigModule/include/CheckConfigDefine.h b/ConfigModule/include/CheckConfigDefine.h index 2669116..45b966a 100644 --- a/ConfigModule/include/CheckConfigDefine.h +++ b/ConfigModule/include/CheckConfigDefine.h @@ -1605,75 +1605,6 @@ struct AD_Analysisy_Bind } }; -// 暗点检测功能 -struct Function_AD_Check -{ - - bool bOpen; // 是否开启 - AD_S_Standard S_standard_3s; // 3s 标准 - AD_S_Standard S_standard_2s; // 2s 标准 - AD_S_Standard S_standard_1s; // 1s 标准 - AD_Analysisy_Num analysis_num; // 数量分析 - AD_Analysisy_Dis analysis_dis; // 距离分析 - AD_Analysisy_S analysis_s; // s 标准分析 - AD_Analysisy_IOU analysis_iou; // IOU 分析 - AD_Analysisy_Bind analysis_bind; // 绑定分析 - - Function_AD_Check() - { - Init(); - } - void Init() - { - bOpen = false; - S_standard_3s.Init(); - S_standard_2s.Init(); - S_standard_1s.Init(); - analysis_num.Init(); - analysis_dis.Init(); - analysis_s.Init(); - analysis_iou.Init(); - } - - void copy(Function_AD_Check tem) - { - this->bOpen = tem.bOpen; - this->S_standard_3s.copy(tem.S_standard_3s); - this->S_standard_2s.copy(tem.S_standard_2s); - this->S_standard_1s.copy(tem.S_standard_1s); - this->analysis_num.copy(tem.analysis_num); - this->analysis_dis.copy(tem.analysis_dis); - this->analysis_s.copy(tem.analysis_s); - this->analysis_iou.copy(tem.analysis_iou); - } - void print(std::string str) - { - printf("%s>>bOpen %d %s %s %s %s %s %s %s\n", str.c_str(), - bOpen, S_standard_3s.GetInfo("3S").c_str(), - S_standard_2s.GetInfo("2S").c_str(), - S_standard_1s.GetInfo("1S").c_str(), - analysis_num.GetInfo("analysis_num").c_str(), - analysis_dis.GetInfo("analysis_dis").c_str(), - analysis_s.GetInfo("analysis_s").c_str(), - analysis_iou.GetInfo("analysis_iou").c_str()); - } - std::string GetInfo(std::string str) - { - char buffer[256]; - sprintf(buffer, "%s>>bOpen %d ", str.c_str(), bOpen); - std::string str123 = buffer; - str123 += S_standard_3s.GetInfo("3S"); - str123 += S_standard_2s.GetInfo("2S"); - str123 += S_standard_1s.GetInfo("1S"); - str123 += analysis_num.GetInfo("analysis_num"); - str123 += analysis_dis.GetInfo("analysis_dis"); - str123 += analysis_s.GetInfo("analysis_s"); - str123 += analysis_iou.GetInfo("analysis_iou"); - - return str123; - } -}; - // 异物检测功能 struct Function_POL_Check { @@ -1816,7 +1747,6 @@ struct CheckFunction Function_Image_Align f_Image_Align; // 图片特征对齐 Function_Detect_LackPol f_Dectect_LackPol; // 缺失POL检测 Function_SecondDet f_SecondDetect; // 二次检测分析 - Function_AD_Check f_AD_Check; // 暗点的检测功能 Function_POL_Check f_POL_Check; // 异物的检测功能 Function_Edge_Det f_dege_Det; Function_Det_BQ f_Det_BQ; @@ -1839,7 +1769,6 @@ struct CheckFunction f_Image_Align.Init(); f_Dectect_LackPol.Init(); f_SecondDetect.Init(); - f_AD_Check.Init(); f_POL_Check.Init(); f_dege_Det.Init(); f_Det_BQ.Init(); @@ -1860,7 +1789,6 @@ struct CheckFunction this->f_Image_Align.copy(tem.f_Image_Align); this->f_Dectect_LackPol.copy(tem.f_Dectect_LackPol); this->f_SecondDetect.copy(tem.f_SecondDetect); - this->f_AD_Check.copy(tem.f_AD_Check); this->f_POL_Check.copy(tem.f_POL_Check); this->f_dege_Det.copy(tem.f_dege_Det); this->f_Det_BQ.copy(tem.f_Det_BQ); @@ -1881,7 +1809,6 @@ struct CheckFunction f_Image_Align.print("Image_Align"); f_Dectect_LackPol.print("Dectect_LackPol"); f_SecondDetect.print("SecondDetect"); - f_AD_Check.print("f_AD_Check"); f_POL_Check.print("f_POL_Check"); f_dege_Det.print("f_dege_Det"); f_Det_BQ.print("f_Det_BQ"); @@ -1903,7 +1830,6 @@ struct CheckFunction str123 += f_Image_Align.GetInfo("Image_Align"); str123 += f_Dectect_LackPol.GetInfo("Dectect_LackPol"); str123 += f_SecondDetect.GetInfo("SecondDetect"); - str123 += f_AD_Check.GetInfo("f_AD_Check"); str123 += f_POL_Check.GetInfo("f_POL_Check"); str123 += f_dege_Det.GetInfo("f_dege_Det"); str123 += f_Det_BQ.GetInfo("f_Det_BQ"); diff --git a/ConfigModule/src/JsonConfig.cpp b/ConfigModule/src/JsonConfig.cpp index 9209203..4d76214 100644 --- a/ConfigModule/src/JsonConfig.cpp +++ b/ConfigModule/src/JsonConfig.cpp @@ -982,89 +982,6 @@ int ChannelFuntonConfigJson::GetFunction(Json::Value value, CheckFunction &funct } // getchar(); } - // 暗点检测 - if ("AD_Check" == strCode) - { - auto value_f = value[i]; - // std::cout << value_f << std::endl; - function.f_AD_Check.bOpen = value_f["isOpen"].asBool(); - if (function.f_AD_Check.bOpen) - { - if (value_f["form"]["AD_S_Standard"]["AD_3S_Area"]) - { - function.f_AD_Check.S_standard_3s.area = value_f["form"]["AD_S_Standard"]["AD_3S_Area"].asFloat(); - } - if (value_f["form"]["AD_S_Standard"]["AD_3S_Len"]) - { - function.f_AD_Check.S_standard_3s.len = value_f["form"]["AD_S_Standard"]["AD_3S_Len"].asFloat(); - } - if (value_f["form"]["AD_S_Standard"]["AD_2S_Area"]) - { - function.f_AD_Check.S_standard_2s.area = value_f["form"]["AD_S_Standard"]["AD_2S_Area"].asFloat(); - } - if (value_f["form"]["AD_S_Standard"]["AD_2S_Len"]) - { - function.f_AD_Check.S_standard_2s.len = value_f["form"]["AD_S_Standard"]["AD_2S_Len"].asFloat(); - } - if (value_f["form"]["AD_S_Standard"]["AD_1S_Area"]) - { - function.f_AD_Check.S_standard_1s.area = value_f["form"]["AD_S_Standard"]["AD_1S_Area"].asFloat(); - } - if (value_f["form"]["AD_S_Standard"]["AD_1S_Len"]) - { - function.f_AD_Check.S_standard_1s.len = value_f["form"]["AD_S_Standard"]["AD_1S_Len"].asFloat(); - } - - if (value_f["form"]["AD_Check_Num"]["Open"]) - { - function.f_AD_Check.analysis_num.bOpen = value_f["form"]["AD_Check_Num"]["Open"].asBool(); - } - if (value_f["form"]["AD_Check_Num"]["Num"]) - { - function.f_AD_Check.analysis_num.numT = value_f["form"]["AD_Check_Num"]["Num"].asInt(); - } - - if (value_f["form"]["AD_Check_Dis"]["Open"]) - { - function.f_AD_Check.analysis_dis.bOpen = value_f["form"]["AD_Check_Dis"]["Open"].asBool(); - } - if (value_f["form"]["AD_Check_Dis"]["Dis"]) - { - function.f_AD_Check.analysis_dis.disT = value_f["form"]["AD_Check_Dis"]["Dis"].asFloat(); - } - - if (value_f["form"]["AD_Check_S"]["Open"]) - { - function.f_AD_Check.analysis_s.bOpen = value_f["form"]["AD_Check_S"]["Open"].asBool(); - } - if (value_f["form"]["AD_Check_S"]["S_value"]) - { - function.f_AD_Check.analysis_s.Check_s_Value = value_f["form"]["AD_Check_S"]["S_value"].asInt(); - } - if (value_f["form"]["AD_Check_S"]["NG_3s"]) - { - function.f_AD_Check.analysis_s.NG_3s = value_f["form"]["AD_Check_S"]["NG_3s"].asBool(); - } - if (value_f["form"]["AD_Check_S"]["Num"]) - { - function.f_AD_Check.analysis_s.Check_s_Num = value_f["form"]["AD_Check_S"]["Num"].asInt(); - } - - if (value_f["form"]["AD_Check_IOU"]["AD_IOU"]) - { - function.f_AD_Check.analysis_iou.AD_IOU = value_f["form"]["AD_Check_IOU"]["AD_IOU"].asFloat(); - } - if (value_f["form"]["AD_Check_IOU"]["AD_Expand"]) - { - function.f_AD_Check.analysis_iou.AD_Expand = value_f["form"]["AD_Check_IOU"]["AD_Expand"].asFloat(); - } - } - else - { - function.f_AD_Check.Init(); - } - // getchar(); - } // 异物检测 if ("POL_Cam" == strCode) {