From 31aa10eaae103c30e02d7dc6c71ff4e50de361b3 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 12 五月 2025 15:28:32 +0800
Subject: [PATCH] 1. 修改报警的显示模式（包括日志，需要后期修复） 2. 添加Release模式编译
---
SourceCode/Bond/Servo/AlarmDlg.cpp | 56 +++++++++++++-------------------------------------------
1 files changed, 13 insertions(+), 43 deletions(-)
diff --git a/SourceCode/Bond/Servo/AlarmDlg.cpp b/SourceCode/Bond/Servo/AlarmDlg.cpp
index c1d8ecd..3ca1d9c 100644
--- a/SourceCode/Bond/Servo/AlarmDlg.cpp
+++ b/SourceCode/Bond/Servo/AlarmDlg.cpp
@@ -55,34 +55,6 @@
if (RX_CODE_ALARM_SET == code) {
UpdatePageData();
-
-
- // 閫氱煡璁惧鐘舵��
- /*
- SERVO::CEqAlarmStep* pStep = nullptr;
- if (pAny->getPtrValue("ptr", (void*&)pStep)) {
- if (pStep != nullptr) {
- // 鑾峰彇 AlarmManager 鍗曚緥
- AlarmManager& alarmManager = AlarmManager::getInstance();
-
- // 浠� pStep 鑾峰彇闇�瑕佺殑鍙傛暟锛屽亣璁捐繖浜涘�兼槸浠� pStep 涓幏鍙栫殑
- AlarmData alarmData;
- alarmData.nId = pStep->getAlarmId();
- alarmData.nSeverityLevel = pStep->getAlarmLevel();
- alarmData.nDeviceId = pStep->getEquipment()->getID();
- alarmData.nUnitId = pStep->getUnitId();
- alarmData.strDeviceName = alarmManager.getDeviceNameById(alarmData.nDeviceId);
- alarmData.strUnitName = alarmManager.getUnitNameById(alarmData.nDeviceId, alarmData.nUnitId);
- const AlarmInfo* pAlarmInfo = alarmManager.getAlarmInfoByID(pStep->getAlarmId());
- alarmData.strDescription = pAlarmInfo != nullptr ? pAlarmInfo->strAlarmText : "";
- if (pStep->getAlarmState() == 1) {
- alarmData.strStartTime = getCurrentTimeString();
- alarmData.strEndTime = "";
- InsertAlarmData(&m_listCtrl, alarmData);
- }
- }
- }
- */
}
else if (RX_CODE_ALARM_CLEAR == code) {
UpdatePageData();
@@ -143,7 +115,6 @@
GetDlgItem(IDC_BUTTON_NEXT_PAGE)->EnableWindow(m_nCurPage < m_nTotalPages);
}
-static char* pszAlarmLevel[] = {"Warning", "Error"};
void CAlarmDlg::FillDataToListCtrl(CListCtrl* pListCtrl, const std::vector<AlarmData>& vecData)
{
if (pListCtrl == nullptr || pListCtrl->m_hWnd == nullptr) {
@@ -155,17 +126,7 @@
// 閬嶅巻鏁版嵁骞舵彃鍏ュ埌CListCtrl涓�
for (const auto& alarm : vecData) {
- int nItem = pListCtrl->InsertItem(pListCtrl->GetItemCount(), _T("")); // 鎻掑叆鏂拌
- CString str;
- // 璁剧疆鍒楀唴瀹�
- str.Format(_T("%d"), alarm.nId);
- pListCtrl->SetItemText(nItem, 1, str); // 鎶ヨID
- pListCtrl->SetItemText(nItem, 2, pszAlarmLevel[alarm.nSeverityLevel % 2]); // 绛夌骇
- pListCtrl->SetItemText(nItem, 3, alarm.strDeviceName.c_str()); // 璁惧鍚嶇О
- pListCtrl->SetItemText(nItem, 4, alarm.strUnitName.c_str()); // 鍗曞厓鍚嶇О
- pListCtrl->SetItemText(nItem, 5, alarm.strStartTime.c_str()); // 寮�濮嬫椂闂�
- pListCtrl->SetItemText(nItem, 6, alarm.strEndTime.c_str()); // 缁撴潫鏃堕棿
- pListCtrl->SetItemText(nItem, 7, alarm.strDescription.c_str()); // 鎻忚堪
+ InsertAlarmData(pListCtrl, alarm);
}
// 鑾峰彇鍒楁暟
@@ -173,6 +134,7 @@
pListCtrl->SetColumnWidth(nColCount - 1, LVSCW_AUTOSIZE_USEHEADER);
}
+static char* pszAlarmLevel[] = { "Warning", "Error" };
void CAlarmDlg::InsertAlarmData(CListCtrl* pListCtrl, const AlarmData& alarmData)
{
if (pListCtrl == nullptr || pListCtrl->m_hWnd == nullptr) {
@@ -190,7 +152,7 @@
CString str;
str.Format(_T("%d"), alarmData.nId);
pListCtrl->SetItemText(nNewItem, 1, str); // 鎶ヨID
- pListCtrl->SetItemText(nNewItem, 2, pszAlarmLevel[alarmData.nSeverityLevel % 2]); // 绛夌骇
+ pListCtrl->SetItemText(nNewItem, 2, pszAlarmLevel[alarmData.nSeverityLevel % 2]); // 绛夌骇
pListCtrl->SetItemText(nNewItem, 3, alarmData.strDeviceName.c_str()); // 璁惧鍚嶇О
pListCtrl->SetItemText(nNewItem, 4, alarmData.strUnitName.c_str()); // 鍗曞厓鍚嶇О
pListCtrl->SetItemText(nNewItem, 5, alarmData.strStartTime.c_str()); // 寮�濮嬫椂闂�
@@ -225,6 +187,7 @@
ON_WM_DESTROY()
ON_WM_CLOSE()
ON_WM_SIZE()
+ ON_WM_TIMER()
ON_CBN_SELCHANGE(IDC_COMBO_DATETIME, &CAlarmDlg::OnCbnSelchangeComboDatetime)
ON_BN_CLICKED(IDC_BUTTON_SEARCH, &CAlarmDlg::OnBnClickedButtonSearch)
ON_BN_CLICKED(IDC_BUTTON_EXPORT, &CAlarmDlg::OnBnClickedButtonExport)
@@ -237,7 +200,7 @@
BOOL CAlarmDlg::OnInitDialog()
{
CDialogEx::OnInitDialog();
- InitRxWindow();
+ SetTimer(1, 3000, nullptr);
// 涓嬫媺妗嗘帶浠�
CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_DATETIME);
@@ -282,7 +245,6 @@
pListCtrl->InsertColumn(6, _T("瑙ｉ櫎鏃堕棿"), LVCFMT_LEFT, width[6]);
pListCtrl->InsertColumn(7, _T("鎻忚堪"), LVCFMT_LEFT, width[7]);
pListCtrl->SetColumnWidth(7, LVSCW_AUTOSIZE_USEHEADER);
-
// 璁＄畻鎬婚〉鏁�
@@ -353,6 +315,14 @@
Resize();
}
+void CAlarmDlg::OnTimer(UINT_PTR nIDEvent)
+{
+ if (1 == nIDEvent) {
+ KillTimer(1);
+ InitRxWindow();
+ }
+}
+
void CAlarmDlg::OnCbnSelchangeComboDatetime()
{
CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_DATETIME);
--
Gitblit v1.9.3