From 709e6278abe167a6ff96a7f9814651a7812f142c Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 10 五月 2025 10:26:18 +0800
Subject: [PATCH] 1.合并刘洋的修改，主要是将警告和日志窗口上移，方便查看和调试。
---
SourceCode/Bond/Servo/AlarmDlg.cpp | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/SourceCode/Bond/Servo/AlarmDlg.cpp b/SourceCode/Bond/Servo/AlarmDlg.cpp
index 4a483e8..3ca1d9c 100644
--- a/SourceCode/Bond/Servo/AlarmDlg.cpp
+++ b/SourceCode/Bond/Servo/AlarmDlg.cpp
@@ -115,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) {
@@ -127,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);
}
// 鑾峰彇鍒楁暟
@@ -145,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) {
@@ -162,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()); // 寮�濮嬫椂闂�
@@ -197,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)
@@ -209,7 +200,7 @@
BOOL CAlarmDlg::OnInitDialog()
{
CDialogEx::OnInitDialog();
- InitRxWindow();
+ SetTimer(1, 3000, nullptr);
// 涓嬫媺妗嗘帶浠�
CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_DATETIME);
@@ -254,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);
-
// 璁＄畻鎬婚〉鏁�
@@ -325,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