From 709e6278abe167a6ff96a7f9814651a7812f142c Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 10 五月 2025 10:26:18 +0800
Subject: [PATCH] 1.合并刘洋的修改，主要是将警告和日志窗口上移，方便查看和调试。

---
 SourceCode/Bond/Servo/ServoDlg.h |   16 ++--------------
 1 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index 85d8e85..ce6cb8d 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -28,20 +28,16 @@
 private:
 	void InitRxWindows();
 	void Resize();
-	void UpdateLogBtn();
-	void UpdateAlarmBtn();
 	void ShowChildPage(int index);
 
 
 private:
 	IObserver* m_pObserver;
-	BOOL m_bShowLogWnd;
-	BOOL m_bShowAlarmWnd;
-	CLogDlg* m_pLogDlg;
-	CAlarmDlg* m_pAlarmDlg;
 	CTerminalDisplayDlg* m_pTerminalDisplayDlg;
 	CPageGraph1* m_pPageGraph1;
 	CPageGraph2* m_pPageGraph2;
+	CAlarmDlg*	 m_pPageAlarm;
+	CLogDlg*	 m_pPageLog;
 
 
 // 对话框数据
@@ -75,11 +71,8 @@
 	afx_msg void OnBnClickedCancel();
 	afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
 	afx_msg void OnDestroy();
-	afx_msg void OnBnClickedButtonLog();
 	afx_msg void OnSize(UINT nType, int cx, int cy);
 	afx_msg void OnClose();
-	afx_msg LRESULT OnLogDlgHide(WPARAM wParam, LPARAM lParam);
-	afx_msg LRESULT OnAlarmDlgHide(WPARAM wParam, LPARAM lParam);
 	afx_msg void OnMoving(UINT fwSide, LPRECT pRect);
 	afx_msg void OnMove(int x, int y);
 	afx_msg void OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu);
@@ -87,10 +80,6 @@
 	afx_msg void OnUpdateMenuFileSettings(CCmdUI* pCmdUI);
 	afx_msg void OnMenuFileSecsTest();
 	afx_msg void OnUpdateMenuFileSecsTest(CCmdUI* pCmdUI);
-	afx_msg void OnMenuWndLog();
-	afx_msg void OnUpdateMenuWndLog(CCmdUI* pCmdUI);
-	afx_msg void OnMenuWndAlarm();
-	afx_msg void OnUpdateMenuWndAlarm(CCmdUI* pCmdUI);
 	afx_msg void OnMenuFileExit();
 	afx_msg void OnUpdateMenuFileExit(CCmdUI* pCmdUI);
 	afx_msg void OnMenuTestMessageSet();
@@ -99,7 +88,6 @@
 	afx_msg void OnUpdateMenuTestMessageClear(CCmdUI* pCmdUI);
 	afx_msg void OnMenuHelpAbout();
 	afx_msg void OnTimer(UINT_PTR nIDEvent);
-	afx_msg void OnBnClickedButtonAlarm();
 	afx_msg LRESULT OnPanelResize(WPARAM wParam, LPARAM lParam);
 	afx_msg void OnTabSelChanged(NMHDR* nmhdr, LRESULT* result);
 };

--
Gitblit v1.9.3