liusiyang
/
BOE_FOG_DETECT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix 同位置3s暗点报出

Browse Source
dev_lsy
liusiyang 2 weeks ago
parent 036d19bbe6
commit 29086815bc
2 changed files with 75 additions and 79 deletions
Show Stats Download Patch File Download Diff File

4
AlgorithmModule/src/QX_Merge_Analysis.cpp
Unescape View File

@ -972,6 +972,10 @@ int QX_Merge_Analysis::Analysis_AD(ALL_Qx_DataList *pALLTypeqxList, int qx_idx)
} }
A_2S_num += AD_list.at(ad_i).num_2s; A_2S_num += AD_list.at(ad_i).num_2s;
A_3S_num += AD_list.at(ad_i).num_3s; A_3S_num += AD_list.at(ad_i).num_3s;
if(AD_list.at(ad_i).num_1s > 2) A_2S_num++;
if(AD_list.at(ad_i).num_1s > 3) A_3S_num++;
if(AD_list.at(ad_i).num_2s > 2) A_2S_num++;
if(AD_list.at(ad_i).num_2s > 3) A_3S_num++;
m_pMergedetlog->AddCheckstr(PrintLevel_2, 3, "AD RGBL255", "AD_list %d %s", m_pMergedetlog->AddCheckstr(PrintLevel_2, 3, "AD RGBL255", "AD_list %d %s",
ad_i, AD_list.at(ad_i).GetInfo().c_str()); ad_i, AD_list.at(ad_i).GetInfo().c_str());
} }

148
ConfigModule/src/JsonConfig.cpp
Unescape View File

@ -32,7 +32,7 @@ void CommonParamToCheckConfigJson::toObjectFromValue(Json::Value root)
std::unique_ptr<Json::CharReader> reader(builder.newCharReader()); std::unique_ptr<Json::CharReader> reader(builder.newCharReader());
Json::Value rootvalue; Json::Value rootvalue;
std::string err; std::string err;
// std::cout << strJson << std::endl; std::cout << strJson << std::endl;
auto nSize = strJson.size(); auto nSize = strJson.size();
if (reader->parse(strJson.c_str(), strJson.c_str() + nSize, &rootvalue, &err)) if (reader->parse(strJson.c_str(), strJson.c_str() + nSize, &rootvalue, &err))
{ {
@ -49,6 +49,7 @@ void CommonParamToCheckConfigJson::toObjectFromValue(Json::Value root)
{ {
_config.baseConfig.strConfigVersion = "NULL"; _config.baseConfig.strConfigVersion = "NULL";
} }
_config.baseConfig.image_widht = value["image_widht"].asInt(); _config.baseConfig.image_widht = value["image_widht"].asInt();
_config.baseConfig.Image_height = value["Image_height"].asInt(); _config.baseConfig.Image_height = value["Image_height"].asInt();
_config.baseConfig.bDrawShieldRoi = value["bDrawShieldRoi"].asBool(); _config.baseConfig.bDrawShieldRoi = value["bDrawShieldRoi"].asBool();
@ -953,83 +954,6 @@ int ChannelFuntonConfigJson::GetFunction(Json::Value value, CheckFunction &funct
} }
// getchar(); // 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) if ("POL_Cam" == strCode)
{ {
@ -1315,6 +1239,74 @@ int BaseFuntonConfigJson::GetFunction(Json::Value value)
// _config.edgeDet.print("edgeDet"); // _config.edgeDet.print("edgeDet");
// getchar(); // 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) if ("Det_Image_Save" == strCode)
{ {
auto value_f = value; auto value_f = value;

Write Preview
Loading…
Cancel
Save