From 31aa10eaae103c30e02d7dc6c71ff4e50de361b3 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 12 五月 2025 15:28:32 +0800
Subject: [PATCH] 1. 修改报警的显示模式（包括日志，需要后期修复） 2. 添加Release模式编译

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

diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index 85d8e85..ec38640 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -28,20 +28,22 @@
 private:
 	void InitRxWindows();
 	void Resize();
-	void UpdateLogBtn();
-	void UpdateAlarmBtn();
+	//void UpdateLogBtn();
+	//void UpdateAlarmBtn();
 	void ShowChildPage(int index);
 
 
 private:
 	IObserver* m_pObserver;
-	BOOL m_bShowLogWnd;
-	BOOL m_bShowAlarmWnd;
-	CLogDlg* m_pLogDlg;
-	CAlarmDlg* m_pAlarmDlg;
+	//BOOL m_bShowLogWnd;
+	//BOOL m_bShowAlarmWnd;
+	//CLogDlg* m_pLogDlg;
+	//CAlarmDlg* m_pAlarmDlg;
 	CTerminalDisplayDlg* m_pTerminalDisplayDlg;
 	CPageGraph1* m_pPageGraph1;
 	CPageGraph2* m_pPageGraph2;
+	CAlarmDlg*	 m_pPageGraph3;
+	CLogDlg*	 m_pPageGraph4;
 
 
 // 对话框数据
@@ -58,8 +60,8 @@
 	HICON m_hIcon;
 	COLORREF m_crBkgnd;
 	HBRUSH m_hbrBkgnd;
-	CBlButton m_btnLog;
-	CBlButton m_btnAlarm;
+	//CBlButton m_btnLog;
+	//CBlButton m_btnAlarm;
 	CPanelMaster* m_pPanelMaster;
 	CPanelEquipment* m_pPanelEquipment;
 	CPanelAttributes* m_pPanelAttributes;
@@ -75,11 +77,11 @@
 	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 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 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 +89,10 @@
 	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 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 +101,7 @@
 	afx_msg void OnUpdateMenuTestMessageClear(CCmdUI* pCmdUI);
 	afx_msg void OnMenuHelpAbout();
 	afx_msg void OnTimer(UINT_PTR nIDEvent);
-	afx_msg void OnBnClickedButtonAlarm();
+	//afx_msg void OnBnClickedButtonAlarm();
 	afx_msg LRESULT OnPanelResize(WPARAM wParam, LPARAM lParam);
 	afx_msg void OnTabSelChanged(NMHDR* nmhdr, LRESULT* result);
 };

--
Gitblit v1.9.3