From 2d69213b1b41b5b039e5dc6f6b7c55d53fd03037 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 13 五月 2025 09:34:04 +0800
Subject: [PATCH] Merge branch 'clh'
---
SourceCode/Bond/Servo/PageAlarm.cpp | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/PageAlarm.cpp b/SourceCode/Bond/Servo/PageAlarm.cpp
index a1d4919..90a1a74 100644
--- a/SourceCode/Bond/Servo/PageAlarm.cpp
+++ b/SourceCode/Bond/Servo/PageAlarm.cpp
@@ -115,7 +115,11 @@
GetDlgItem(IDC_BUTTON_NEXT_PAGE)->EnableWindow(m_nCurPage < m_nTotalPages);
}
+<<<<<<< HEAD:SourceCode/Bond/Servo/AlarmDlg.cpp
+void CAlarmDlg::FillDataToListCtrl(CListCtrl* pListCtrl, const std::vector<AlarmData>& vecData)
+=======
void CPageAlarm::FillDataToListCtrl(CListCtrl* pListCtrl, const std::vector<AlarmData>& vecData)
+>>>>>>> clh:SourceCode/Bond/Servo/PageAlarm.cpp
{
if (pListCtrl == nullptr || pListCtrl->m_hWnd == nullptr) {
return;
@@ -135,7 +139,11 @@
}
static char* pszAlarmLevel[] = { "Warning", "Error" };
+<<<<<<< HEAD:SourceCode/Bond/Servo/AlarmDlg.cpp
+void CAlarmDlg::InsertAlarmData(CListCtrl* pListCtrl, const AlarmData& alarmData)
+=======
void CPageAlarm::InsertAlarmData(CListCtrl* pListCtrl, const AlarmData& alarmData)
+>>>>>>> clh:SourceCode/Bond/Servo/PageAlarm.cpp
{
if (pListCtrl == nullptr || pListCtrl->m_hWnd == nullptr) {
return;
@@ -187,12 +195,20 @@
ON_WM_DESTROY()
ON_WM_CLOSE()
ON_WM_SIZE()
+<<<<<<< HEAD:SourceCode/Bond/Servo/AlarmDlg.cpp
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)
+ ON_BN_CLICKED(IDC_BUTTON_PREV_PAGE, &CAlarmDlg::OnBnClickedButtonPrevPage)
+ ON_BN_CLICKED(IDC_BUTTON_NEXT_PAGE, &CAlarmDlg::OnBnClickedButtonNextPage)
+=======
ON_CBN_SELCHANGE(IDC_COMBO_DATETIME, &CPageAlarm::OnCbnSelchangeComboDatetime)
ON_BN_CLICKED(IDC_BUTTON_SEARCH, &CPageAlarm::OnBnClickedButtonSearch)
ON_BN_CLICKED(IDC_BUTTON_EXPORT, &CPageAlarm::OnBnClickedButtonExport)
ON_BN_CLICKED(IDC_BUTTON_PREV_PAGE, &CPageAlarm::OnBnClickedButtonPrevPage)
ON_BN_CLICKED(IDC_BUTTON_NEXT_PAGE, &CPageAlarm::OnBnClickedButtonNextPage)
+>>>>>>> clh:SourceCode/Bond/Servo/PageAlarm.cpp
END_MESSAGE_MAP()
@@ -315,7 +331,8 @@
Resize();
}
-void CPageAlarm::OnTimer(UINT_PTR nIDEvent)
+<<<<<<< HEAD:SourceCode/Bond/Servo/AlarmDlg.cpp
+void CAlarmDlg::OnTimer(UINT_PTR nIDEvent)
{
if (1 == nIDEvent) {
KillTimer(1);
@@ -323,7 +340,10 @@
}
}
+void CAlarmDlg::OnCbnSelchangeComboDatetime()
+=======
void CPageAlarm::OnCbnSelchangeComboDatetime()
+>>>>>>> clh:SourceCode/Bond/Servo/PageAlarm.cpp
{
CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_DATETIME);
int nIndex = pComboBox->GetCurSel();
--
Gitblit v1.9.3