update energy改为double

AlgorithmModule/include/BlobBase.h

@@ -44,7 +44,7 @@ typedef struct ERROR_DOTS_BLOB_DATA
 	unsigned short minx, miny;
 	unsigned short maxx, maxy;
 	int area;
-	int energy;
+	double energy;
 	float JudgArea;
 	float len;
 	int macro[_MAX_MACRO_COUNT];

AlgorithmModule/include/ImageDetConfig.h

@@ -29,7 +29,7 @@ struct QX_ERROR_INFO_
 	std::string result_name;
 	cv::Rect roi;
 	int area;
-	int energy;
+	double energy;
 	float JudgArea;
 	float JudgArea_second;
 	float flen;

AlgorithmModule/src/Blob.c

@@ -227,7 +227,7 @@ void MergeBlob(ERROR_DOTS_BLOBS *blobs, ERROR_DOTS_BLOB_PARAM *param)
 		int miny = blob->miny;
 		int maxx = blob->maxx;
 		int maxy = blob->maxy;
-		int energy = blob->energy;
+		double energy = blob->energy;
 
 		int left = minx - pace, right = maxx + pace;
 		int top = miny - 1, bottom = maxy + 1;

AlgorithmModule/src/CheckResultJson.cpp

@@ -103,7 +103,7 @@ void CheckResultJson::toObjectFromValue(Json::Value root)
 				tem.roi.width = errorJson["roi"]["width"].asInt();
 				tem.roi.height = errorJson["roi"]["height"].asInt();
 				tem.area = errorJson["area"].asInt();
-				tem.energy = errorJson["energy"].asInt();
+				tem.energy = errorJson["energy"].asDouble();
 				tem.JudgArea = errorJson["JudgArea"].asFloat();
 				if (errorJson["JudgArea_second"])
 				{

AlgorithmModule/src/ImageResultJudge.cpp

@@ -191,7 +191,7 @@ int ImageResultJudge::ResultJudge(std::shared_ptr<ImageAllResult> pImageResult)
 		float JudgArea_second = QX_info->JudgArea_second;
 		float flen = QX_info->flen;
 		float grayDis = QX_info->grayDis;
-		int energy = QX_info->energy;
+		double energy = QX_info->energy;
 		float fupS = QX_info->fUpIou;
 		int maxValue = QX_info->maxValue;
 		float density = QX_info->density;
@@ -208,7 +208,7 @@ int ImageResultJudge::ResultJudge(std::shared_ptr<ImageAllResult> pImageResult)
 		}
 
 		pQxLog->AddCheckstr(PrintLevel_1,
-							"ResultJudge", "qxidx: %d/%d  qx_status %d  roi[%d %d  %d  %d]  qx %d %s %s JudgArea %f  hj %f len %f energy %d region %s",
+							"ResultJudge", "qxidx: %d/%d  qx_status %d  roi[%d %d  %d  %d]  qx %d %s %s JudgArea %f  hj %f len %f energy %.0f region %s",
 							qxidx, qxNum, qx_status, roi.x, roi.y, roi.width, roi.height, config_qx_type, qx_name.c_str(), qx_wb.c_str(),
 							JudgArea, grayDis, flen, energy, strdetRegionidxList.c_str());
 
@@ -373,7 +373,7 @@ int ImageResultJudge::ResultJudge(std::shared_ptr<ImageAllResult> pImageResult)
 						}
 						if (energy < Et)
 						{
-							pQxLog->AddCheckstr(PrintLevel_4, DET_LOG_LEVEL_3, "Energy", "%s -> %d %s %f ",
+							pQxLog->AddCheckstr(PrintLevel_4, DET_LOG_LEVEL_3, "Energy", "%s -> %.0f %s %f ",
 												BOOL_TO_STR(energy >= Et), energy, BOOL_TO_ThanLess(energy >= Et), Et);
 						}
 						if (grayDis < hj)
@@ -823,7 +823,7 @@ int ImageResultJudge::MergeResult(std::shared_ptr<ImageAllResult> pImageResult,
 			float JudgArea = QX_info->JudgArea;
 			float flen = QX_info->flen;
 			float grayDis = QX_info->grayDis;
-			int energy = QX_info->energy;
+			double energy = QX_info->energy;
 			float fupS = QX_info->fUpIou;
 			int maxValue = QX_info->maxValue;
 			float density = QX_info->density;
@@ -857,7 +857,7 @@ int ImageResultJudge::MergeResult(std::shared_ptr<ImageAllResult> pImageResult,
 			float fmaxScore = 0;
 
 			pQxLog->AddCheckstr(PrintLevel_3, DET_LOG_LEVEL_3,
-								"qx", "roi[%d %d  %d  %d]  qx %d %s  JudgArea %f hj %f len %f energy %d,",
+								"qx", "roi[%d %d  %d  %d]  qx %d %s  JudgArea %f hj %f len %f energy %.0f,",
 								roi.x, roi.y, roi.width, roi.height, config_qx_type, qx_name.c_str(),
 								JudgArea, grayDis, flen, energy);
 			// 生成缺陷小图
@@ -1551,7 +1551,7 @@ int ImageResultJudge::AnalysisResult_Pre(QX_ERROR_INFO_ *QX_info)
 	float JudgArea_second = QX_info->JudgArea_second;
 	float flen = QX_info->flen;
 	float grayDis = QX_info->grayDis;
-	int energy = QX_info->energy;
+	double energy = QX_info->energy;
 	float fupS = QX_info->fUpIou;
 	int maxValue = QX_info->maxValue;
 	float density = QX_info->density;
@@ -1669,7 +1669,7 @@ int ImageResultJudge::AnalysisResult_Pre(QX_ERROR_INFO_ *QX_info)
 				pQxLog->AddCheckstr(PrintLevel_4, DET_LOG_LEVEL_3, "result", "%s   param idx %d / %d", BOOL_TO_STR(bjudge), j + 1, pParam->useNum);
 				pQxLog->AddCheckstr(PrintLevel_4, DET_LOG_LEVEL_3, "Area", "%s -> %f %s %f ",
 									BOOL_TO_STR(JudgArea >= At), JudgArea, BOOL_TO_ThanLess(JudgArea >= At), At);
-				pQxLog->AddCheckstr(PrintLevel_4, DET_LOG_LEVEL_3, "Energy", "%s -> %d %s %f ",
+				pQxLog->AddCheckstr(PrintLevel_4, DET_LOG_LEVEL_3, "Energy", "%s -> %.0f %s %f ",
 									BOOL_TO_STR(energy >= Et), energy, BOOL_TO_ThanLess(energy >= Et), Et);
 				pQxLog->AddCheckstr(PrintLevel_4, DET_LOG_LEVEL_3, "HJ", "%s -> %f %s %f ",
 									BOOL_TO_STR(grayDis > hj), grayDis, BOOL_TO_ThanLess(grayDis > hj), hj);