From c1c4d51585fd2bf07ecde55224ef241f5b553cfa Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 10 六月 2025 08:42:11 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/Servo/ServoDlg.h |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index a281b1c..fbf4f05 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -6,6 +6,7 @@
 #include "BlButton.h"
 #include "PageLog.h"
 #include "PageAlarm.h"
+#include "PageTransferLog.h"
 #include "PageRecipe.h"
 #include "TerminalDisplayDlg.h"
 #include "CPanelMaster.h"
@@ -15,6 +16,7 @@
 #include "CPageGraph2.h"
 #include "TopToolbar.h"
 #include "CMyStatusbar.h"
+#include "CRobotTaskDlg.h"
 
 
 // CServoDlg 对话框
@@ -37,12 +39,13 @@
 private:
 	IObserver* m_pObserver;
 	CTerminalDisplayDlg* m_pTerminalDisplayDlg;
+	CRobotTaskDlg* m_pRobotTaskDlg;
 	CPageGraph1* m_pPageGraph1;
 	CPageGraph2* m_pPageGraph2;
 	CPageRecipe* m_pPageRecipe;
 	CPageAlarm*	 m_pPageAlarm;
 	CPageLog*	 m_pPageLog;
-
+	CPageTransferLog* m_pPageTransferLog;
 
 // 对话框数据
 #ifdef AFX_DESIGN_TIME
@@ -95,4 +98,5 @@
 	afx_msg LRESULT OnPanelResize(WPARAM wParam, LPARAM lParam);
 	afx_msg void OnTabSelChanged(NMHDR* nmhdr, LRESULT* result);
 	LRESULT OnToolbarBtnClicked(WPARAM wParam, LPARAM lParam);
+	LRESULT OnStatusbarBtnClicked(WPARAM wParam, LPARAM lParam);
 };

--
Gitblit v1.9.3