兼容10到16英寸高度时相机提升高度情况下的轮毂直径检测

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;

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