From 6da913343f320029f2a7b5b7c6aae7e8831a5fd4 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 10 三月 2025 18:22:01 +0800
Subject: [PATCH] 1.完善报警窗口，报警信息展示，有报警信息变化时刷新列表。
---
SourceCode/Bond/Servo/ServoDlg.h | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index 88ed43d..685acf1 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -6,7 +6,12 @@
#include "ServoGraph.h"
#include "BlButton.h"
#include "LogDlg.h"
+#include "AlarmDlg.h"
#include "TerminalDisplayDlg.h"
+#include "CPanelMaster.h"
+#include "CPanelEquipment.h"
+#include "CPanelAttributes.h"
+
enum DeviceStatus {
ONLINE, // 在线
@@ -28,6 +33,7 @@
void InitRxWindows();
void Resize();
void UpdateLogBtn();
+ void UpdateAlarmBtn();
void UpdateRobotPosition(float percentage);
void RotateRobot(float angleInDegrees);
void UpdateDeviceStatus(int id, DeviceStatus status);
@@ -36,7 +42,9 @@
private:
IObserver* m_pObserver;
BOOL m_bShowLogWnd;
+ BOOL m_bShowAlarmWnd;
CLogDlg* m_pLogDlg;
+ CAlarmDlg* m_pAlarmDlg;
CTerminalDisplayDlg* m_pTerminalDisplayDlg;
@@ -59,7 +67,10 @@
COLORREF m_crBkgnd;
HBRUSH m_hbrBkgnd;
CBlButton m_btnLog;
-
+ CBlButton m_btnAlarm;
+ CPanelMaster* m_pPanelMaster;
+ CPanelEquipment* m_pPanelEquipment;
+ CPanelAttributes* m_pPanelAttributes;
// 生成的消息映射函数
virtual BOOL OnInitDialog();
@@ -76,6 +87,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);
@@ -85,9 +97,14 @@
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 OnMenuHelpAbout();
afx_msg void OnTimer(UINT_PTR nIDEvent);
afx_msg BOOL OnEraseBkgnd(CDC* pDC);
+ afx_msg void OnBnClickedButtonAlarm();
+ afx_msg void OnGraphItemClicked(NMHDR* pNMHDR, LRESULT* pResult);
+ afx_msg LRESULT OnPanelResize(WPARAM wParam, LPARAM lParam);
};
--
Gitblit v1.9.3