diff --git a/AlgorithmModule/src/ImgCheckAnalysisy.cpp b/AlgorithmModule/src/ImgCheckAnalysisy.cpp index d839ec4..e18f897 100644 --- a/AlgorithmModule/src/ImgCheckAnalysisy.cpp +++ b/AlgorithmModule/src/ImgCheckAnalysisy.cpp @@ -427,6 +427,7 @@ int ImgCheckAnalysisy::CheckRun() m_pdetlog->AddCheckstr(PrintLevel_0, "1、basic Info", "---------------------------1、basic Info---------------------------------"); m_pdetlog->AddCheckstr(PrintLevel_0, "Version", "%s", GetVersion().c_str()); + m_pdetlog->AddCheckstr(PrintLevel_0, "ConfigVersion", "%s", m_pBasicConfig->strConfigVersion.c_str()); m_pdetlog->AddCheckstr(PrintLevel_0, "Start", "%s", m_pImageAllResult->strBaseInfo.c_str()); m_pdetlog->AddCheckstr(PrintLevel_0, "ImgageScale", "Scale_X = %f Scale_Y = %f", m_fImgage_Scale_X, m_fImgage_Scale_Y); diff --git a/ConfigModule/include/CheckConfigDefine.h b/ConfigModule/include/CheckConfigDefine.h index bf540fe..e1c4c2b 100644 --- a/ConfigModule/include/CheckConfigDefine.h +++ b/ConfigModule/include/CheckConfigDefine.h @@ -453,6 +453,7 @@ struct BasicConfig float fImage_Scale_y; // 成像精度 float fProduct_Off_X_mm; // 产品偏移量 std::string strCamName; // + std::string strConfigVersion; // 配置版本 float density_R_mm; // 密度计算半径 像素 BasicConfig() @@ -475,6 +476,7 @@ struct BasicConfig density_R_mm = 5; strCamName = ""; fProduct_Off_X_mm = 0; + strConfigVersion = "1.0"; strCamearName = EMPTY_CONFIG_NAME; } void copy(BasicConfig tem) @@ -499,6 +501,7 @@ struct BasicConfig this->fImage_Scale_y = tem.fImage_Scale_y; this->density_R_mm = tem.density_R_mm; this->strCamearName = tem.strCamearName; + this->strConfigVersion = tem.strConfigVersion; } void print(std::string str = "") { diff --git a/ConfigModule/src/JsonConfig.cpp b/ConfigModule/src/JsonConfig.cpp index 72eb5dc..b838f7f 100644 --- a/ConfigModule/src/JsonConfig.cpp +++ b/ConfigModule/src/JsonConfig.cpp @@ -44,6 +44,11 @@ void CommonParamToCheckConfigJson::toObjectFromValue(Json::Value root) // getchar(); if (value.isObject()) { + _config.baseConfig.strConfigVersion = value["version"].asString(); + if ( _config.baseConfig.strConfigVersion == "") + { + _config.baseConfig.strConfigVersion = "NULL"; + } _config.baseConfig.image_widht = value["image_widht"].asInt(); _config.baseConfig.Image_height = value["Image_height"].asInt(); _config.baseConfig.bDrawShieldRoi = value["bDrawShieldRoi"].asBool();