From 6557916b7bea826fdb9aca8e7f990b0728b25116 Mon Sep 17 00:00:00 2001
From: tangchao0503 <735056338@qq.com>
Date: Thu, 20 Aug 2026 11:07:31 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E8=87=AA=E5=8A=A8=E8=B0=83?=
 =?UTF-8?q?=E7=84=A6=E5=AE=8C=E6=88=90=E5=90=8E=E5=BC=B9=E7=AA=97=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E4=B8=8A=E6=B5=B7=E5=86=9C=E7=A7=91=E9=99=A2?=
 =?UTF-8?q?=E6=95=B4=E4=B8=AA=E6=B5=81=E7=A8=8B=E5=85=A8=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E4=B8=8D=E9=9C=80=E8=A6=81=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HPPA/TwoMotorControl.cpp |  1 +
 HPPA/focusWindow.cpp     | 19 +++++++++++++++++--
 HPPA/focusWindow.h       |  4 ++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/HPPA/TwoMotorControl.cpp b/HPPA/TwoMotorControl.cpp
index 6c7541a..f2128a7 100644
--- a/HPPA/TwoMotorControl.cpp
+++ b/HPPA/TwoMotorControl.cpp
@@ -237,6 +237,7 @@ void TwoMotorControl::run4_ObtainTargetDepthInfo(DepthCameraWindow* window, doub
 void TwoMotorControl::run5_AutoFocus(double autoFocusX, double autoFocusY)
 {
 	m_focusWindow = new focusWindow(this, m_Imager);
+	m_focusWindow->setIsDisplaysAutofocusResultViaPopup(false);
 	m_focusWindow->onConnectMotor();
 	m_focusWindow->show();
 
diff --git a/HPPA/focusWindow.cpp b/HPPA/focusWindow.cpp
index 9bd7383..cf86a90 100644
--- a/HPPA/focusWindow.cpp
+++ b/HPPA/focusWindow.cpp
@@ -657,12 +657,20 @@ void focusWindow::moveAfterAutoFocus(int motorID, double location)
 		if (!m_isAutoFocusSuccess)
 		{
 			qDebug() << "纹理较弱，自动调焦效果不佳！请使用调焦纸进行自动调焦！";
-			//showMessageBox(QString::fromLocal8Bit("纹理较弱，自动调焦效果不佳！请使用调焦纸进行自动调焦！"));
+
+			if (m_isDisplaysAutofocusResultViaPopup)
+			{
+				showMessageBox(QString::fromLocal8Bit("纹理较弱，自动调焦效果不佳！请使用调焦纸进行自动调焦！"));
+			}
 		}
 		else
 		{
 			qDebug() << "自动调焦成功！";
-			//showMessageBox(QString::fromLocal8Bit("自动调焦成功！"));
+			
+			if (m_isDisplaysAutofocusResultViaPopup)
+			{
+				showMessageBox(QString::fromLocal8Bit("自动调焦成功！"));
+			}
 		}
 		emit AutoFocusFinishedSignal(0);
 	}
@@ -673,6 +681,13 @@ void focusWindow::moveAfterAutoFocus(int motorID, double location)
 		//移动马达到最佳位置
 		emit move2LocSignal(0, (double)m_goodPos, m_dSpeed, 1000);
 	}
+
+	m_isDisplaysAutofocusResultViaPopup = true;
+}
+
+void focusWindow::setIsDisplaysAutofocusResultViaPopup(bool isDisplaysAutofocusResultViaPopup)
+{
+	m_isDisplaysAutofocusResultViaPopup = isDisplaysAutofocusResultViaPopup;
 }
 
 double focusWindow::getErrorRate(double targetLoc, double actualLoc)
diff --git a/HPPA/focusWindow.h b/HPPA/focusWindow.h
index 52c1768..b866f64 100644
--- a/HPPA/focusWindow.h
+++ b/HPPA/focusWindow.h
@@ -111,6 +111,8 @@ public:
 
 	ImagerOperationBase* m_Imager;
 
+	void setIsDisplaysAutofocusResultViaPopup(bool isDisplaysAutofocusResultViaPopup);
+
 protected:
 	bool eventFilter(QObject *obj, QEvent *event) override;
 
@@ -152,6 +154,8 @@ private:
 	
 	double getErrorRate(double targetLoc, double actualLoc);
 
+	bool m_isDisplaysAutofocusResultViaPopup = true;
+
 public Q_SLOTS:
 	void onConnectMotor();
 	void onMove2MotorLogicZero();