From 245fc7f4ef141824b6a2f4098765f2648713b461 Mon Sep 17 00:00:00 2001
From: tangchao0503 <735056338@qq.com>
Date: Thu, 16 Jul 2026 16:09:23 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=87=AA=E5=8A=A8=E8=B0=83=E7=84=A6bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=87=AA=E5=8A=A8=E8=B0=83=E7=84=A6?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=8E=EF=BC=8C=E7=A7=BB=E5=8A=A8=E5=88=B0?=
 =?UTF-8?q?=E6=9C=80=E4=BD=B3=E4=BD=8D=E7=BD=AE=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HPPA/focusWindow.cpp | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/HPPA/focusWindow.cpp b/HPPA/focusWindow.cpp
index 471c884..e5a1121 100644
--- a/HPPA/focusWindow.cpp
+++ b/HPPA/focusWindow.cpp
@@ -498,19 +498,25 @@ void focusWindow::onAutoFocusFinished()
 
 void focusWindow::moveAfterAutoFocus(int motorID, double location)
 {
+	//QObject* obj = sender();
+
+	//if (obj == m_multiAxisController)
+	//{
+	//	qDebug() << "sender is m_multiAxisController.";
+	//}
+
 	if (!m_isMoveAfterAutoFocus)
 	{
+		//std::cout << "focusWindow::moveAfterAutoFocus" << std::endl;
 		return;
 	}
 
 	std::cout << "\n已经到达位置：" << location  << std::endl;
 
-	//移动马达到最佳位置
-	emit move2LocSignal(0, (double)m_goodPos, m_dSpeed, 1000);
-
 	double tmp = abs(location - m_goodPos) / m_goodPos * 100;
-	if (tmp<5)
+	if (tmp < 5)
 	{
+		m_isMoveAfterAutoFocus = false;
 		if (!m_isAutoFocusSuccess)
 		{
 			QMessageBox msgBox;
@@ -523,7 +529,11 @@ void focusWindow::moveAfterAutoFocus(int motorID, double location)
 			msgBox.setText(QString::fromLocal8Bit("自动调焦成功！"));
 			msgBox.exec();
 		}
-		m_isMoveAfterAutoFocus = false;
+	}
+	else
+	{
+		//移动马达到最佳位置
+		emit move2LocSignal(0, (double)m_goodPos, m_dSpeed, 1000);
 	}
 }