diff --git a/AlgorithmModule/src/CameraCheckAnalysisy.cpp b/AlgorithmModule/src/CameraCheckAnalysisy.cpp index a4e0155..dd8e123 100644 --- a/AlgorithmModule/src/CameraCheckAnalysisy.cpp +++ b/AlgorithmModule/src/CameraCheckAnalysisy.cpp @@ -153,11 +153,11 @@ int CameraCheckAnalysisy::Detect_Pre() return 1; } - //判断图片左右,0为左,1为右 - bool exchange_img = ifExchange(pImageResult->result->in_shareImage->img, pImageResult->result->in_shareImage->img_B, pImageResult->result->in_shareImage->strCameraName); - if(exchange_img){ - std::swap(pImageResult->result->in_shareImage->img, pImageResult->result->in_shareImage->img_B); - } + // //判断图片左右,0为左,1为右 + // bool exchange_img = ifExchange(pImageResult->result->in_shareImage->img, pImageResult->result->in_shareImage->img_B, pImageResult->result->in_shareImage->strCameraName); + // if(exchange_img){ + // std::swap(pImageResult->result->in_shareImage->img, pImageResult->result->in_shareImage->img_B); + // } // printf("===66666666666666666\n"); // int re = Mergimg(pImageResult->result->in_shareImage->img, pImageResult->result->in_shareImage->img_B, @@ -182,7 +182,7 @@ int CameraCheckAnalysisy::Detect_Pre() if (pImageResult->result->in_shareImage->Det_Mode == DET_MODE_MergeImg) { - cv::imwrite(pImageResult->result->in_shareImage->strCameraName + "_MergeImg.png", pImageResult->result->in_shareImage->img); + cv::imwrite(pImageResult->result->in_shareImage->strCameraName + "_MergeImg.jpg", pImageResult->result->in_shareImage->img); return 2; } diff --git a/AlgorithmModule/src/ImageResultJudge.cpp b/AlgorithmModule/src/ImageResultJudge.cpp index 00c68f6..679b186 100644 --- a/AlgorithmModule/src/ImageResultJudge.cpp +++ b/AlgorithmModule/src/ImageResultJudge.cpp @@ -522,8 +522,6 @@ int ImageResultJudge::ResultJudge(std::shared_ptr pImageResult) tem.strTypeName = QX_Result_Names[nqx_type]; tem.qx_Code = QX_Result_Code[nqx_type]; tem.srcImgroi = roi; - tem.srcImgroi.x += pDetResult->CutRoi.x; - tem.srcImgroi.y += pDetResult->CutRoi.y; tem.len = flen; tem.breadth = fbreadth; tem.qx_type = 0; @@ -641,8 +639,6 @@ int ImageResultJudge::ResultJudge(std::shared_ptr pImageResult) tem.strTypeName = QX_Result_Names[nqx_type]; tem.qx_Code = QX_Result_Code[nqx_type]; tem.srcImgroi = roi; - tem.srcImgroi.x += pDetResult->CutRoi.x; - tem.srcImgroi.y += pDetResult->CutRoi.y; tem.len = flen; tem.breadth = fbreadth; tem.qx_type = 0;