解决合并冲突问题，编译通过

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)
 	{

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<mCircle> 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 {
+	{
-=======
-	else */{
->>>>>>> .merge_file_a27936
 		center.x = centerX;
 		center.y = centerY;
 		radius = 0;

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"