diff --git a/AlgorithmModule/include/ImageDetConfig.h b/AlgorithmModule/include/ImageDetConfig.h index 8f2d19d..b734d75 100644 --- a/AlgorithmModule/include/ImageDetConfig.h +++ b/AlgorithmModule/include/ImageDetConfig.h @@ -30,6 +30,7 @@ struct QX_ERROR_INFO_ float fbreadth; int nconfig_qx_type; std::string qx_name; + std::string qx_level; // 缺陷等级 int maxValue; int whiteOrBlack; float grayDis; @@ -56,6 +57,7 @@ struct QX_ERROR_INFO_ flen = 0; nconfig_qx_type = 0; qx_name = ""; + qx_level = ""; maxValue = 0; grayDis = 0; fUpIou = 0; @@ -82,6 +84,7 @@ struct QX_ERROR_INFO_ << ", Flen: " << flen << ", nconfig_qx_type: " << nconfig_qx_type << ", QX Name: " << qx_name + << ", QX Level: " << qx_level << ", Max Value: " << maxValue << ", Gray Dis: " << grayDis << ", fUpIou: " << fUpIou diff --git a/AlgorithmModule/include/ImgCheckConfig.h b/AlgorithmModule/include/ImgCheckConfig.h index edb425f..d0ffaf6 100644 --- a/AlgorithmModule/include/ImgCheckConfig.h +++ b/AlgorithmModule/include/ImgCheckConfig.h @@ -280,6 +280,7 @@ struct QXImageResult int type; // 缺陷类型 std::string qx_Code; // 缺陷code std::string strTypeName; // 缺陷名称 + std::string qx_level; // 缺陷等级 cv::Mat srcImg; // 缺陷原始图片 cv::Mat resizeImg; // 缺陷缩略图 @@ -344,6 +345,7 @@ struct QXImageResult max_v = 0; strTypeName = ""; qx_Code = ""; + qx_level = ""; len = 0; breadth = 0; idx = 0; diff --git a/AlgorithmModule/src/CheckResultJson.cpp b/AlgorithmModule/src/CheckResultJson.cpp index f6c18b3..0e23679 100644 --- a/AlgorithmModule/src/CheckResultJson.cpp +++ b/AlgorithmModule/src/CheckResultJson.cpp @@ -50,6 +50,7 @@ Json::Value CheckResultJson::toJsonValue() value["flen"] = p->flen; value["nconfig_qx_type"] = p->nconfig_qx_type; value["qx_name"] = p->qx_name; + value["qx_level"] = p->qx_level; value["maxValue"] = p->maxValue; value["grayDis"] = p->grayDis; value["fUpIou"] = p->fUpIou; @@ -138,6 +139,7 @@ void CheckResultJson::toObjectFromValue(Json::Value root) tem.flen = errorJson["flen"].asFloat(); tem.nconfig_qx_type = errorJson["nconfig_qx_type"].asInt(); tem.qx_name = errorJson["qx_name"].asString(); + tem.qx_level = errorJson["qx_level"].asString(); tem.maxValue = errorJson["maxValue"].asInt(); tem.grayDis = errorJson["grayDis"].asFloat(); tem.fUpIou = errorJson["fUpIou"].asFloat(); diff --git a/AlgorithmModule/src/ImageResultJudge.cpp b/AlgorithmModule/src/ImageResultJudge.cpp index 6df9b06..85e701f 100644 --- a/AlgorithmModule/src/ImageResultJudge.cpp +++ b/AlgorithmModule/src/ImageResultJudge.cpp @@ -610,6 +610,7 @@ int ImageResultJudge::ResultJudge(std::shared_ptr pImageResult) tem.max_v = maxValue; tem.strTypeName = QX_Result_Names[nqx_type]; tem.qx_Code = QX_Result_Code[nqx_type]; + tem.qx_level = QX_info->qx_level; // 缺陷 roi 映射回原图(按仿射矩阵映射, 否则按 CutRoi 平移) { const cv::Mat &srcSizeImg = pImageResult->result->in_shareImage->img; @@ -746,6 +747,7 @@ int ImageResultJudge::ResultJudge(std::shared_ptr pImageResult) tem.max_v = maxValue; tem.strTypeName = QX_Result_Names[nqx_type]; tem.qx_Code = QX_Result_Code[nqx_type]; + tem.qx_level = QX_info->qx_level; // 缺陷 roi 映射回原图(按仿射矩阵映射, 否则按 CutRoi 平移) { const cv::Mat &srcSizeImg = pImageResult->result->in_shareImage->img;