From b6219c9c0f31346056887e8b80a76076eb8c628d Mon Sep 17 00:00:00 2001
From: QuShuailong <qu.shuailong@hzleaper.com>
Date: Sun, 24 Apr 2022 13:47:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B910=E5=88=B016=E8=8B=B1?=
 =?UTF-8?q?=E5=AF=B8=E9=AB=98=E5=BA=A6=E6=97=B6=E7=9B=B8=E6=9C=BA=E6=8F=90?=
 =?UTF-8?q?=E5=8D=87=E9=AB=98=E5=BA=A6=E6=83=85=E5=86=B5=E4=B8=8B=E7=9A=84?=
 =?UTF-8?q?=E8=BD=AE=E6=AF=82=E7=9B=B4=E5=BE=84=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/tpMain/ModelManager.cpp | 7 +++++--
 tpvs17/tpMain/lpMainWin.cpp | 9 +++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/tpMain/ModelManager.cpp b/src/tpMain/ModelManager.cpp
index 8bacf3b..8fc8457 100644
--- a/src/tpMain/ModelManager.cpp
+++ b/src/tpMain/ModelManager.cpp
@@ -170,8 +170,11 @@ QStringList ModelManager::getAllTrainModelName()
 	QStringList allTrainModelNameList;
 	for each (IWheelModel* var in m_mpModels) 
 	{
-		if (var->getAddTrainFlag()) {
-			allTrainModelNameList.append(var->getModelID());
+		if (var->getAddTrainFlag()) 
+		{
+			int	nTypeModel = var->getImageModel();
+			if (nTypeModel == 0/*emTypeModelSuccess*/)
+				allTrainModelNameList.append(var->getModelID());
 		}
 	}
 	return allTrainModelNameList;
diff --git a/tpvs17/tpMain/lpMainWin.cpp b/tpvs17/tpMain/lpMainWin.cpp
index 0c3aab8..d35fcae 100644
--- a/tpvs17/tpMain/lpMainWin.cpp
+++ b/tpvs17/tpMain/lpMainWin.cpp
@@ -27,6 +27,9 @@
 #define VERSION_ALG "3.0.1.5"
 #define UPDATE_TIME "2021-11-24"
 
+#define WHEELHIGHTTHRESH 260.0 //轮毂高度阈值，当轮毂高度大于这个值时，启用相机升高的直径算法
+#define CAMERAUPHEIGHT 254.0 //相机上升高度，默认10英寸
+
 #pragma execution_character_set("utf-8")
 lpMainWin::lpMainWin(QWidget *parent)
 	: QMainWindow(parent)
@@ -738,7 +741,13 @@ QVariant lpMainWin::IGetVariantById(int id)
 	if (DetectState::instance()->m_IsUseRaster == 0)
 		nThickness = m_nWfThress;
 	else
+	{
 		nThickness = m_pCtrl->getThickness();
+		if (nThickness > WHEELHIGHTTHRESH)
+		{
+			nThickness -= CAMERAUPHEIGHT;
+		}
+	}
 
 	vMap.insert("thickness", QVariant(nThickness));
 	double dDiameter;// = (-794.25 * nThickness / 1000000.0 + 0.775960);