From 7ce963d99ab9e0371fb8ddeb4d3b36840233fcac Mon Sep 17 00:00:00 2001 From: "bob.pan" Date: Mon, 17 Jan 2022 17:09:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=90=88=E5=B9=B6=E5=86=B2?= =?UTF-8?q?=E7=AA=81=E9=97=AE=E9=A2=98=EF=BC=8C=E7=BC=96=E8=AF=91=E9=80=9A?= =?UTF-8?q?=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/algorithm/AlgorithmCompare.cpp | 6 ------ src/algorithm/ImageProcess.cpp | 16 ++-------------- tpvs17/tpMain/lpMainWin.cpp | 6 ------ 3 files changed, 2 insertions(+), 26 deletions(-) diff --git a/src/algorithm/AlgorithmCompare.cpp b/src/algorithm/AlgorithmCompare.cpp index 7913e6b..4fa33dd 100644 --- a/src/algorithm/AlgorithmCompare.cpp +++ b/src/algorithm/AlgorithmCompare.cpp @@ -251,10 +251,7 @@ int CAlgorithmCompare::IImageAnalysis(class IImageObject* pImgObj) QImage srcImg = cvMat2QImage(matSrc); rltMap.insert("srcImage", srcImg); pImgObj->IVariantMapToUI(rltMap); -<<<<<<< .merge_file_a27156 -======= matSrc.release(); ->>>>>>> .merge_file_a27208 return 0; } @@ -307,13 +304,10 @@ cv::Mat CAlgorithmCompare::getImage(class IImageObject *pImgObj) int nBytesPerLine; BYTE* pImageData = pImgObj->IImageData(nImageW, nImageH, nBitsPerPixel, nBytesPerLine); Mat matSrc; -<<<<<<< .merge_file_a27156 -======= if (pImageData == nullptr) return matSrc; if (nImageH <= 0 || nImageW <= 0) return matSrc; ->>>>>>> .merge_file_a27208 if (TP_COLOR_Y800 != colorFormat) { diff --git a/src/algorithm/ImageProcess.cpp b/src/algorithm/ImageProcess.cpp index f6a72bf..afafaab 100644 --- a/src/algorithm/ImageProcess.cpp +++ b/src/algorithm/ImageProcess.cpp @@ -64,22 +64,13 @@ cv::Mat ImageProcess::findCircle(const Mat &srcImg, Point2f& center, double &rad equalizeHist(detectImg, detectImg); detectImg = _EnhanImg_sharpen(detectImg); -<<<<<<< .merge_file_a37956 -======= float centerX = 0; float centerY = 0; /* ->>>>>>> .merge_file_a27936 EDCircles edcircles(detectImg); vector EDCircle = edcircles.getCircles(); double maxR = 0; int nIndex = -1; -<<<<<<< .merge_file_a37956 - float centerX = 0; - float centerY = 0; -======= - ->>>>>>> .merge_file_a27936 double tmpmaxR = 0; for (int i = 0; i < EDCircle.size(); i++) { @@ -113,11 +104,8 @@ cv::Mat ImageProcess::findCircle(const Mat &srcImg, Point2f& center, double &rad center.y = (EDCircle[nIndex].center.y * REAIZE); return DetectCircle(srcImg, Mat(), center, radius, bEqual, cParam); } -<<<<<<< .merge_file_a37956 - else { -======= - else */{ ->>>>>>> .merge_file_a27936 + else */ + { center.x = centerX; center.y = centerY; radius = 0; diff --git a/tpvs17/tpMain/lpMainWin.cpp b/tpvs17/tpMain/lpMainWin.cpp index 12af899..6c71567 100644 --- a/tpvs17/tpMain/lpMainWin.cpp +++ b/tpvs17/tpMain/lpMainWin.cpp @@ -22,15 +22,9 @@ #include "databasesql.h" #include "lpCryptokey.h" -<<<<<<< HEAD -#define VERSION_HUB "3.0.5.1" -#define VERSION_ALG "3.0.1.5" -#define UPDATE_TIME "2021-12-24" -======= #define VERSION_HUB "3.0.6.0" #define VERSION_ALG "3.0.1.4" #define UPDATE_TIME "2022-01-17" ->>>>>>> 57de921ce5bba1fcef21dfc4c42bb20cc9cc518e #pragma execution_character_set("utf-8") #define MODEL_UI_ICON_NONE ":/image/no-img"