diff --git a/ConfigModule/include/CheckConfigDefine.h b/ConfigModule/include/CheckConfigDefine.h index e9251d9..11497a5 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", diff --git a/ConfigModule/src/JsonConfig.cpp b/ConfigModule/src/JsonConfig.cpp index 3506282..6168c86 100644 --- a/ConfigModule/src/JsonConfig.cpp +++ b/ConfigModule/src/JsonConfig.cpp @@ -954,6 +954,83 @@ 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(); + } + } + else + { + function.f_AD_Check.Init(); + } + // getchar(); + } // 异物检测 if ("POL_Cam" == strCode) { @@ -1239,74 +1316,6 @@ int BaseFuntonConfigJson::GetFunction(Json::Value value) // _config.edgeDet.print("edgeDet"); // getchar(); } - if ("AD_Check" == strCode) - { - auto value_f = value; - _config.ad_check.bOpen = value_f["isOpen"].asBool(); - if (_config.ad_check.bOpen) - { - if (value_f["form"]["AD_S_Standard"]["AD_3S_Area"]) - { - _config.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"]) - { - _config.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"]) - { - _config.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"]) - { - _config.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"]) - { - _config.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"]) - { - _config.ad_check.S_standard_1s.len = value_f["form"]["AD_S_Standard"]["AD_1S_Len"].asFloat(); - } - if (value_f["form"]["AD_Check_Num"]["Open"]) - { - _config.ad_check.analysis_num.bOpen = value_f["form"]["AD_Check_Num"]["Open"].asBool(); - } - if (value_f["form"]["AD_Check_Num"]["Num"]) - { - _config.ad_check.analysis_num.numT = value_f["form"]["AD_Check_Num"]["Num"].asInt(); - } - if (value_f["form"]["AD_Check_Dis"]["Open"]) - { - _config.ad_check.analysis_dis.bOpen = value_f["form"]["AD_Check_Dis"]["Open"].asBool(); - } - if (value_f["form"]["AD_Check_Dis"]["Dis"]) - { - _config.ad_check.analysis_dis.disT = value_f["form"]["AD_Check_Dis"]["Dis"].asFloat(); - } - if (value_f["form"]["AD_S_Analysis"]["Open"]) - { - _config.ad_check.analysis_s.bOpen = value_f["form"]["AD_S_Analysis"]["Open"].asBool(); - } - if (value_f["form"]["AD_S_Analysis"]["NG_3S"]) - { - _config.ad_check.analysis_s.NG_3s = value_f["form"]["AD_S_Analysis"]["NG_3S"].asBool(); - } - if (value_f["form"]["AD_S_Analysis"]["S_Value"]) - { - _config.ad_check.analysis_s.Check_s_Value = value_f["form"]["AD_S_Analysis"]["S_Value"].asInt(); - } - if (value_f["form"]["AD_S_Analysis"]["S_Num"]) - { - _config.ad_check.analysis_s.Check_s_Num = value_f["form"]["AD_S_Analysis"]["S_Num"].asInt(); - } - } - else - { - _config.ad_check.Init(); - } - } if ("Det_Image_Save" == strCode) { auto value_f = value;