From 2af991c1c72211b3b6b7fda703846bc017bc1908 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 10 三月 2025 11:25:33 +0800
Subject: [PATCH] 1.修复上一次合并代码遗留问题；
---
SourceCode/Bond/Servo/AlarmDlg.cpp | 63 ++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 22 deletions(-)
diff --git a/SourceCode/Bond/Servo/AlarmDlg.cpp b/SourceCode/Bond/Servo/AlarmDlg.cpp
index 24721b8..f12426f 100644
--- a/SourceCode/Bond/Servo/AlarmDlg.cpp
+++ b/SourceCode/Bond/Servo/AlarmDlg.cpp
@@ -5,6 +5,7 @@
#include "Servo.h"
#include "afxdialogex.h"
#include "AlarmDlg.h"
+#include "AlarmManager.h"
#include "Common.h"
#include <iomanip>
@@ -65,13 +66,15 @@
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);
@@ -84,13 +87,14 @@
bool result = alarmManager.addAlarm(alarmData, alarmEventId);
if (result) {
LOGI("<CAlarmDlg> Alarm added successfully!");
- }
+ }
else {
LOGI("<CAlarmDlg> Failed to add alarm.");
- }
- }
}
}
+ }
+ }
+
pAny->release();
}, [&]() -> void {
@@ -149,6 +153,10 @@
void CAlarmDlg::FillDataToListCtrl(CListCtrl* pListCtrl, const std::vector<AlarmData>& vecData)
{
+ if (pListCtrl == nullptr || pListCtrl->m_hWnd == nullptr) {
+ return;
+ }
+
// 娓呯┖褰撳墠CListCtrl涓殑鎵�鏈夐」
pListCtrl->DeleteAllItems();
@@ -163,14 +171,22 @@
pListCtrl->SetItemText(nItem, 2, str); // 绛夌骇
pListCtrl->SetItemText(nItem, 3, alarm.strDeviceName.c_str()); // 璁惧鍚嶇О
pListCtrl->SetItemText(nItem, 4, alarm.strUnitName.c_str()); // 鍗曞厓鍚嶇О
- pListCtrl->SetItemText(nItem, 5, alarm.strDescription.c_str()); // 鎻忚堪
- pListCtrl->SetItemText(nItem, 6, alarm.strStartTime.c_str()); // 寮�濮嬫椂闂�
- pListCtrl->SetItemText(nItem, 7, alarm.strEndTime.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()); // 鎻忚堪
}
+
+ // 鑾峰彇鍒楁暟
+ int nColCount = pListCtrl->GetHeaderCtrl()->GetItemCount();
+ pListCtrl->SetColumnWidth(nColCount - 1, LVSCW_AUTOSIZE_USEHEADER);
}
void CAlarmDlg::InsertAlarmData(CListCtrl* pListCtrl, const AlarmData& alarmData)
{
+ if (pListCtrl == nullptr || pListCtrl->m_hWnd == nullptr) {
+ return;
+ }
+
int nRowCount = pListCtrl->GetItemCount();
if (nRowCount >= PAGE_SIZE) {
pListCtrl->DeleteItem(nRowCount - 1);
@@ -186,9 +202,9 @@
pListCtrl->SetItemText(nNewItem, 2, str); // 绛夌骇
pListCtrl->SetItemText(nNewItem, 3, alarmData.strDeviceName.c_str()); // 璁惧鍚嶇О
pListCtrl->SetItemText(nNewItem, 4, alarmData.strUnitName.c_str()); // 鍗曞厓鍚嶇О
- pListCtrl->SetItemText(nNewItem, 5, alarmData.strDescription.c_str()); // 鎻忚堪
- pListCtrl->SetItemText(nNewItem, 6, alarmData.strStartTime.c_str()); // 寮�濮嬫椂闂�
- pListCtrl->SetItemText(nNewItem, 7, alarmData.strEndTime.c_str()); // 缁撴潫鏃堕棿
+ pListCtrl->SetItemText(nNewItem, 5, alarmData.strStartTime.c_str()); // 寮�濮嬫椂闂�
+ pListCtrl->SetItemText(nNewItem, 6, alarmData.strEndTime.c_str()); // 缁撴潫鏃堕棿
+ pListCtrl->SetItemText(nNewItem, 7, alarmData.strDescription.c_str()); // 鎻忚堪
}
std::string CAlarmDlg::getCurrentTimeString()
@@ -215,6 +231,7 @@
BEGIN_MESSAGE_MAP(CAlarmDlg, CDialogEx)
ON_WM_CTLCOLOR()
ON_WM_DESTROY()
+ ON_WM_CLOSE()
ON_WM_SIZE()
ON_CBN_SELCHANGE(IDC_COMBO_DATETIME, &CAlarmDlg::OnCbnSelchangeComboDatetime)
ON_BN_CLICKED(IDC_BUTTON_SEARCH, &CAlarmDlg::OnBnClickedButtonSearch)
@@ -255,12 +272,13 @@
ListView_SetImageList(pListCtrl->GetSafeHwnd(), imageList, LVSIL_SMALL);
pListCtrl->InsertColumn(0, _T(""), LVCFMT_RIGHT, 0);
pListCtrl->InsertColumn(1, _T("璀﹀憡ID"), LVCFMT_LEFT, 50);
- pListCtrl->InsertColumn(2, _T("鎶ヨ绛夌骇"), LVCFMT_LEFT, 50);
- pListCtrl->InsertColumn(3, _T("璁惧鍚嶇О"), LVCFMT_LEFT, 120);
- pListCtrl->InsertColumn(4, _T("鍗曞厓鍚嶇О"), LVCFMT_LEFT, 120);
- pListCtrl->InsertColumn(5, _T("鎻忚堪"), LVCFMT_LEFT, 180);
- pListCtrl->InsertColumn(6, _T("鍙戠敓鏃堕棿"), LVCFMT_LEFT, 180);
- pListCtrl->InsertColumn(7, _T("瑙ｉ櫎鏃堕棿"), LVCFMT_LEFT, 180);
+ pListCtrl->InsertColumn(2, _T("鎶ヨ绛夌骇"), LVCFMT_LEFT, 60);
+ pListCtrl->InsertColumn(3, _T("璁惧鍚嶇О"), LVCFMT_LEFT, 100);
+ pListCtrl->InsertColumn(4, _T("鍗曞厓鍚嶇О"), LVCFMT_LEFT, 100);
+ pListCtrl->InsertColumn(5, _T("鍙戠敓鏃堕棿"), LVCFMT_LEFT, 120);
+ pListCtrl->InsertColumn(6, _T("瑙ｉ櫎鏃堕棿"), LVCFMT_LEFT, 120);
+ pListCtrl->InsertColumn(7, _T("鎻忚堪"), LVCFMT_LEFT, 180);
+ pListCtrl->SetColumnWidth(7, LVSCW_AUTOSIZE_USEHEADER);
// 璁＄畻鎬婚〉鏁�
int totalRecords = AlarmManager::getInstance().getTotalAlarmCount("", "", m_strDeviceName, m_strUnitName, m_strKeyword, m_szTimeStart, m_szTimeEnd);
@@ -272,11 +290,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)
@@ -308,6 +321,12 @@
}
}
+void CAlarmDlg::OnClose()
+{
+ ShowWindow(SW_HIDE);
+ GetParent()->PostMessage(ID_MSG_ALARMDLG_HIDE, 0, 0);
+}
+
void CAlarmDlg::OnSize(UINT nType, int cx, int cy)
{
CDialogEx::OnSize(nType, cx, cy);
--
Gitblit v1.9.3