From 50a42e5d72e2f8cf92ff9b2273e0442977dbcefd Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期三, 18 十二月 2024 18:28:02 +0800
Subject: [PATCH] 1. 对话框基类添加动态控件管理 2. 对话框基类主题切换功能

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

diff --git a/SourceCode/Bond/BondEq/AlarmMonitor.h b/SourceCode/Bond/BondEq/AlarmMonitor.h
index fe1108c..c7cf2f1 100644
--- a/SourceCode/Bond/BondEq/AlarmMonitor.h
+++ b/SourceCode/Bond/BondEq/AlarmMonitor.h
@@ -21,14 +21,18 @@
 	virtual void OnTimer(UINT nTimerid);
 	const char* getAlarmText(int nID);
 	virtual void Serialize(CArchive& ar);
-	void getAlarmingMap(std::map<int, CAlarm*>& alarms);
+	std::map<int, CAlarm*>& getAlarmingMap();
 	BOOL isAlarming();
+	CAlarm* getActiveAlarm();
+	void getAlarmRecords(std::list< CAlarm*>& list);
 
 private:
 	BOOL compareData(const char* pScrData, const char* pTarData, int len);
 	int addAlarmTemplate(int id, int level, const char* pszDescription);
 	BOOL isAlarmOn(int id);
 	BOOL findAlarm(std::vector<int>& ids, int id);
+	void addAlarmToHistoryRecord(CAlarm* pAlarm);
+	BOOL addAlarming(CAlarm* pAlarm);
 
 private:
 	std::map<int, CAlarm*> m_mapAlarmTemplate;	// 这是警告的模板，从文件加载

--
Gitblit v1.9.3