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 | 64 +++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 22 deletions(-)
diff --git a/SourceCode/Bond/Servo/AlarmDlg.cpp b/SourceCode/Bond/Servo/PageAlarm.cpp
similarity index 86%
rename from SourceCode/Bond/Servo/AlarmDlg.cpp
rename to SourceCode/Bond/Servo/PageAlarm.cpp
index 3ca1d9c..90a1a74 100644
--- a/SourceCode/Bond/Servo/AlarmDlg.cpp
+++ b/SourceCode/Bond/Servo/PageAlarm.cpp
@@ -4,7 +4,7 @@
#include "stdafx.h"
#include "Servo.h"
#include "afxdialogex.h"
-#include "AlarmDlg.h"
+#include "PageAlarm.h"
#include "AlarmManager.h"
#include "Common.h"
#include <iomanip>
@@ -12,11 +12,11 @@
#define PAGE_SIZE 100
#define PAGE_BACKGROUND_COLOR RGB(252, 252, 255)
-// CAlarmDlg 瀵硅瘽妗�
+// CPageAlarm 瀵硅瘽妗�
-IMPLEMENT_DYNAMIC(CAlarmDlg, CDialogEx)
+IMPLEMENT_DYNAMIC(CPageAlarm, CDialogEx)
-CAlarmDlg::CAlarmDlg(CWnd* pParent /*=nullptr*/)
+CPageAlarm::CPageAlarm(CWnd* pParent /*=nullptr*/)
: CDialogEx(IDD_DIALOG_ALARM, pParent)
{
m_crBkgnd = PAGE_BACKGROUND_COLOR;
@@ -37,11 +37,11 @@
m_szTimeEnd[0] = '\0';
}
-CAlarmDlg::~CAlarmDlg()
+CPageAlarm::~CPageAlarm()
{
}
-void CAlarmDlg::InitRxWindow()
+void CPageAlarm::InitRxWindow()
{
/* code */
// 璁㈤槄鏁版嵁
@@ -73,7 +73,7 @@
}
}
-void CAlarmDlg::Resize()
+void CPageAlarm::Resize()
{
CWnd* pItem;
CRect rcClient;
@@ -83,14 +83,14 @@
pItem->MoveWindow(12, 58, rcClient.Width() - 24, rcClient.Height() - 64);
}
-void CAlarmDlg::LoadAlarms()
+void CPageAlarm::LoadAlarms()
{
// 鍒锋柊鍘嗗彶鎶ヨ鏁版嵁
m_nCurPage = 1;
UpdatePageData();
}
-void CAlarmDlg::UpdatePageData()
+void CPageAlarm::UpdatePageData()
{
// 鏍规嵁杩囨护鏉′欢鍔犺浇鏁版嵁锛屾彁渚涙弿杩板拰鏃堕棿鑼冨洿鏌ヨ
auto vecData = AlarmManager::getInstance().getFilteredAlarms("", "", m_strDeviceName, m_strUnitName, m_strKeyword, m_szTimeStart, m_szTimeEnd, m_nCurPage, PAGE_SIZE);
@@ -103,7 +103,7 @@
UpdatePageControls();
}
-void CAlarmDlg::UpdatePageControls()
+void CPageAlarm::UpdatePageControls()
{
// 鏇存柊鍒嗛〉淇℃伅
CString strPage;
@@ -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;
@@ -160,7 +168,7 @@
pListCtrl->SetItemText(nNewItem, 7, alarmData.strDescription.c_str()); // 鎻忚堪
}
-std::string CAlarmDlg::getCurrentTimeString()
+std::string CPageAlarm::getCurrentTimeString()
{
auto now = std::chrono::system_clock::now();
auto time_t_now = std::chrono::system_clock::to_time_t(now);
@@ -173,7 +181,7 @@
return ss.str();
}
-void CAlarmDlg::DoDataExchange(CDataExchange* pDX)
+void CPageAlarm::DoDataExchange(CDataExchange* pDX)
{
DDX_Control(pDX, IDC_DATETIMEPICKER_START, m_dateTimeStart);
DDX_Control(pDX, IDC_DATETIMEPICKER_END, m_dateTimeEnd);
@@ -182,22 +190,30 @@
}
-BEGIN_MESSAGE_MAP(CAlarmDlg, CDialogEx)
+BEGIN_MESSAGE_MAP(CPageAlarm, CDialogEx)
ON_WM_CTLCOLOR()
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()
// CAlarmDlg 娑堟伅澶勭悊绋嬪簭
-BOOL CAlarmDlg::OnInitDialog()
+BOOL CPageAlarm::OnInitDialog()
{
CDialogEx::OnInitDialog();
SetTimer(1, 3000, nullptr);
@@ -259,7 +275,7 @@
// 寮傚父: OCX 灞炴�ч〉搴旇繑鍥� FALSE
}
-HBRUSH CAlarmDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
+HBRUSH CPageAlarm::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
{
HBRUSH hbr = CDialogEx::OnCtlColor(pDC, pWnd, nCtlColor);
@@ -274,7 +290,7 @@
return m_hbrBkgnd;
}
-void CAlarmDlg::OnDestroy()
+void CPageAlarm::OnDestroy()
{
CDialogEx::OnDestroy();
@@ -302,19 +318,20 @@
}
}
-void CAlarmDlg::OnClose()
+void CPageAlarm::OnClose()
{
ShowWindow(SW_HIDE);
GetParent()->PostMessage(ID_MSG_ALARMDLG_HIDE, 0, 0);
}
-void CAlarmDlg::OnSize(UINT nType, int cx, int cy)
+void CPageAlarm::OnSize(UINT nType, int cx, int cy)
{
CDialogEx::OnSize(nType, cx, cy);
if (GetDlgItem(IDC_LIST_ALARM) == nullptr) return;
Resize();
}
+<<<<<<< HEAD:SourceCode/Bond/Servo/AlarmDlg.cpp
void CAlarmDlg::OnTimer(UINT_PTR nIDEvent)
{
if (1 == nIDEvent) {
@@ -324,6 +341,9 @@
}
void CAlarmDlg::OnCbnSelchangeComboDatetime()
+=======
+void CPageAlarm::OnCbnSelchangeComboDatetime()
+>>>>>>> clh:SourceCode/Bond/Servo/PageAlarm.cpp
{
CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_DATETIME);
int nIndex = pComboBox->GetCurSel();
@@ -332,7 +352,7 @@
m_dateTimeEnd.EnableWindow(nIndex == nCount - 1);
}
-void CAlarmDlg::OnBnClickedButtonSearch()
+void CPageAlarm::OnBnClickedButtonSearch()
{
// 鑾峰彇鍏抽敭瀛�
CString cstrKeyword;
@@ -392,7 +412,7 @@
UpdatePageData(); // 璋冪敤鍒嗛〉鏇存柊鍑芥暟
}
-void CAlarmDlg::OnBnClickedButtonExport()
+void CPageAlarm::OnBnClickedButtonExport()
{
CFileDialog fileDialog(FALSE, "csv", "", OFN_HIDEREADONLY, "csv.files(*.csv)|*.csv||");
if (fileDialog.DoModal() != IDOK) {
@@ -452,14 +472,14 @@
file.Close();
}
-void CAlarmDlg::OnBnClickedButtonPrevPage()
+void CPageAlarm::OnBnClickedButtonPrevPage()
{
// 鐐瑰嚮涓婁竴椤�
m_nCurPage--;
UpdatePageData(); // 璋冪敤鍒嗛〉鏇存柊鍑芥暟
}
-void CAlarmDlg::OnBnClickedButtonNextPage()
+void CPageAlarm::OnBnClickedButtonNextPage()
{
// 鐐瑰嚮涓嬩竴椤�
m_nCurPage++;
--
Gitblit v1.9.3