From 9d48f280e9a512d894ecdd05d80d8ec3915a704c Mon Sep 17 00:00:00 2001
From: Darker <mr.darker@163.com>
Date: 星期三, 05 三月 2025 17:13:17 +0800
Subject: [PATCH] 1. 完善报警窗口显示 1.1 日志和报警窗口同一时间只能显示一个 1.2 报警窗口跟随主窗口移动 1.3 重写报警窗口的关闭方法

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

diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index ab71ed2..dc5314e 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -6,6 +6,7 @@
 #include "ServoGraph.h"
 #include "BlButton.h"
 #include "LogDlg.h"
+#include "AlarmDlg.h"
 #include "TerminalDisplayDlg.h"
 
 enum DeviceStatus {
@@ -39,6 +40,7 @@
 	BOOL m_bShowLogWnd;
 	BOOL m_bShowAlarmWnd;
 	CLogDlg* m_pLogDlg;
+	CAlarmDlg* m_pAlarmDlg;
 	CTerminalDisplayDlg* m_pTerminalDisplayDlg;
 
 
@@ -79,6 +81,7 @@
 	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);

--
Gitblit v1.9.3