|
|
|
|
@ -586,7 +586,6 @@ int ImageResultJudge::ResultJudge(std::shared_ptr<ImageAllResult> pImageResult)
|
|
|
|
|
// CheckUtil::printROI(CutRoi, "CutRoi");
|
|
|
|
|
cv::Size sz = cv::Size(QX_SAMLLIMG_WIDTH, QX_SAMLLIMG_HEIGHT);
|
|
|
|
|
|
|
|
|
|
#ifdef AI_Time
|
|
|
|
|
if (pImageResult->detImg.channels() == 1)
|
|
|
|
|
{
|
|
|
|
|
cv::cvtColor(pImageResult->detImg(CutRoi), tem.srcImg, cv::COLOR_GRAY2BGR);
|
|
|
|
|
@ -596,7 +595,6 @@ int ImageResultJudge::ResultJudge(std::shared_ptr<ImageAllResult> pImageResult)
|
|
|
|
|
tem.srcImg = pImageResult->detImg(CutRoi).clone();
|
|
|
|
|
}
|
|
|
|
|
cv::resize(tem.srcImg, tem.resizeImg, sz);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
int nqx_type = ConfigTypeToResultType(config_qx_type);
|
|
|
|
|
tem.type = nqx_type;
|
|
|
|
|
@ -641,9 +639,7 @@ int ImageResultJudge::ResultJudge(std::shared_ptr<ImageAllResult> pImageResult)
|
|
|
|
|
m_CheckResult_shareP->nresult = nqx_type;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifdef AI_Time
|
|
|
|
|
GetAIDetImg(pImageResult, pCenter, tem.AI_in_Img, tem.AI_out_img);
|
|
|
|
|
#endif
|
|
|
|
|
m_CheckResult_shareP->qxImageResult.push_back(tem);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
@ -654,9 +650,7 @@ int ImageResultJudge::ResultJudge(std::shared_ptr<ImageAllResult> pImageResult)
|
|
|
|
|
m_CheckResult_shareP->nYS_result = nqx_type;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifdef AI_Time
|
|
|
|
|
GetAIDetImg(pImageResult, pCenter, tem.AI_in_Img, tem.AI_out_img);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
m_CheckResult_shareP->YS_ImageResult.push_back(tem);
|
|
|
|
|
}
|
|
|
|
|
@ -833,7 +827,6 @@ int ImageResultJudge::MergeResult(std::shared_ptr<ImageAllResult> pImageResult,
|
|
|
|
|
cv::Rect CutRoi = GetCutRoi(roi, pImageResult->detImg);
|
|
|
|
|
cv::Size sz = cv::Size(QX_SAMLLIMG_WIDTH, QX_SAMLLIMG_HEIGHT);
|
|
|
|
|
|
|
|
|
|
#ifdef AI_Time
|
|
|
|
|
if (pImageResult->detImg.channels() == 1)
|
|
|
|
|
{
|
|
|
|
|
cv::cvtColor(pImageResult->detImg(CutRoi), tem.srcImg, cv::COLOR_GRAY2BGR);
|
|
|
|
|
@ -843,7 +836,6 @@ int ImageResultJudge::MergeResult(std::shared_ptr<ImageAllResult> pImageResult,
|
|
|
|
|
tem.srcImg = pImageResult->detImg(CutRoi).clone();
|
|
|
|
|
}
|
|
|
|
|
cv::resize(tem.srcImg, tem.resizeImg, sz);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
int nerrortype = 1;
|
|
|
|
|
int checkFlage = ANALYSIS_TYPE_TF;
|
|
|
|
|
@ -904,9 +896,7 @@ int ImageResultJudge::MergeResult(std::shared_ptr<ImageAllResult> pImageResult,
|
|
|
|
|
{
|
|
|
|
|
m_CheckResult_shareP->nresult = nqx_type;
|
|
|
|
|
}
|
|
|
|
|
#ifdef AI_Time
|
|
|
|
|
GetAIDetImg(pImageResult, pCenter, tem.AI_in_Img, tem.AI_out_img);
|
|
|
|
|
#endif
|
|
|
|
|
m_CheckResult_shareP->qxImageResult.push_back(tem);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|