From e2aba4b899f691b68a5d95f27981d25581142cb1 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期一, 16 十二月 2024 16:59:54 +0800
Subject: [PATCH] 1. 创建配方和删除配方 2. 配方数据分模块，比如轴的数据就是一个模块
---
SourceCode/Bond/BondEq/CPageAlarm.cpp | 30 ++++++------------------------
1 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/SourceCode/Bond/BondEq/CPageAlarm.cpp b/SourceCode/Bond/BondEq/CPageAlarm.cpp
index ffffedd..f03c56b 100644
--- a/SourceCode/Bond/BondEq/CPageAlarm.cpp
+++ b/SourceCode/Bond/BondEq/CPageAlarm.cpp
@@ -157,20 +157,17 @@
{
CAlarmMonitor* pMonitor = (CAlarmMonitor*)theApp.m_model.getBonder().GetComponent(ALARM_MONITOR);
+
+ // 当前正在发生的报警
pMonitor->Lock();
-
-#if 0
std::map<int, CAlarm*>& alarmings = pMonitor->getAlarmingMap();
- std::list< CAlarm*>& alarms = pMonitor->getAlarmRecords();
-
for (auto item : alarmings) {
AddAlarm(pMonitor, item.second);
}
- for (auto item : alarms) {
- AddAlarm(pMonitor, item);
- }
-#else
- // 获取报警数据
+ pMonitor->Unlock();
+
+
+ // 获取历史报警数据
auto vecData = AlarmManager::getInstance().getAllAlarms();
// 填充数据
@@ -182,9 +179,6 @@
pListCtrl->SetItemText(0, 3, item[2].c_str());
pListCtrl->SetItemText(0, 4, item[3].c_str());
}
-#endif // 0
-
- pMonitor->Unlock();
}
void CPageAlarm::AddAlarm(CAlarmMonitor* pMonitor, CAlarm* pAlarm)
@@ -202,12 +196,6 @@
if (pAlarm->getOffTime() > 0) {
pListCtrl->SetItemText(0, 4, CToolUnits::timeToString2(pAlarm->getOffTime()).c_str());
}
-
- AlarmManager::getInstance().addAlarm(
- std::to_string(pAlarm->getId()).c_str(),
- pMonitor->getAlarmText(pAlarm->getId()),
- CToolUnits::timeToString2(pAlarm->getOnTime()).c_str(),
- CToolUnits::timeToString2(pAlarm->getOffTime()).c_str());
}
void CPageAlarm::UpdateAlarm(CAlarmMonitor* pMonitor, CAlarm* pAlarm)
@@ -220,12 +208,6 @@
if (pListCtrl->GetItemData(i) == (DWORD_PTR)pAlarm) {
if (pAlarm->getOffTime() > 0) {
pListCtrl->SetItemText(i, 4, CToolUnits::timeToString2(pAlarm->getOffTime()).c_str());
-
- AlarmManager::getInstance().updateAlarmEndTime(
- std::to_string(pAlarm->getId()).c_str(),
- pMonitor->getAlarmText(pAlarm->getId()),
- CToolUnits::timeToString2(pAlarm->getOnTime()).c_str(),
- CToolUnits::timeToString2(pAlarm->getOffTime()).c_str());
}
}
}
--
Gitblit v1.9.3