From 2c01babee844f91f8c7a680ce562667a291e95ac Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 10 三月 2025 16:29:28 +0800
Subject: [PATCH] 1.菜单/窗口，增加“警告窗口”项
---
SourceCode/Bond/Servo/AlarmDlg.cpp | 24 ++++++------------------
1 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/SourceCode/Bond/Servo/AlarmDlg.cpp b/SourceCode/Bond/Servo/AlarmDlg.cpp
index 66c14dd..3c3ff33 100644
--- a/SourceCode/Bond/Servo/AlarmDlg.cpp
+++ b/SourceCode/Bond/Servo/AlarmDlg.cpp
@@ -66,30 +66,22 @@
AlarmData alarmData;
alarmData.nId = pStep->getAlarmId();
alarmData.nSeverityLevel = pStep->getAlarmLevel();
- alarmData.nDeviceId = pStep->getAlarmDev();
+ alarmData.nDeviceId = pStep->getEquipment()->getID();
alarmData.nUnitId = pStep->getUnitId();
alarmData.strDeviceName = alarmManager.getDeviceNameById(alarmData.nDeviceId);
alarmData.strUnitName = alarmManager.getUnitNameById(alarmData.nDeviceId, alarmData.nUnitId);
- alarmData.strDescription = pStep->getText();
alarmData.strStartTime = getCurrentTimeString();
alarmData.strEndTime = "2000-01-01 00:00";
+
+ const AlarmInfo* pAlarmInfo = alarmManager.getAlarmInfoByID(pStep->getAlarmId());
+ alarmData.strDescription = pAlarmInfo != nullptr ? pAlarmInfo->strAlarmText : "";
// 鎻掑叆鍒楄〃鎺т欢
CListCtrl* pListCtrl = (CListCtrl*)GetDlgItem(IDC_LIST_ALARM);
if (pListCtrl != nullptr) {
InsertAlarmData(pListCtrl, alarmData);
}
-
- // 娣诲姞鏂扮殑 Alarm 鏁版嵁
- int alarmEventId = 0;
- bool result = alarmManager.addAlarm(alarmData, alarmEventId);
- if (result) {
- LOGI("<CAlarmDlg> Alarm added successfully!");
}
- else {
- LOGI("<CAlarmDlg> Failed to add alarm.");
- }
- }
}
}
@@ -114,7 +106,7 @@
GetClientRect(&rcClient);
pItem = GetDlgItem(IDC_LIST_ALARM);
- pItem->MoveWindow(12, 52, rcClient.Width() - 24, rcClient.Height() - 64);
+ pItem->MoveWindow(12, 58, rcClient.Width() - 24, rcClient.Height() - 64);
}
void CAlarmDlg::LoadAlarms()
@@ -279,6 +271,7 @@
pListCtrl->SetColumnWidth(7, LVSCW_AUTOSIZE_USEHEADER);
// 璁＄畻鎬婚〉鏁�
+ int totalRecords = AlarmManager::getInstance().getTotalAlarmCount("", "", m_strDeviceName, m_strUnitName, m_strKeyword, m_szTimeStart, m_szTimeEnd);
m_nTotalPages = (totalRecords + PAGE_SIZE - 1) / PAGE_SIZE;
m_nCurPage = 1;
@@ -287,11 +280,6 @@
return TRUE; // return TRUE unless you set the focus to a control
// 寮傚父: OCX 灞炴�ч〉搴旇繑鍥� FALSE
-}
-
-BOOL CAlarmDlg::DestroyWindow()
-{
- return CDialogEx::DestroyWindow();
}
HBRUSH CAlarmDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
--
Gitblit v1.9.3