From 1e8e3473cb124f9e51dfc1ca35e5cb13b1668bdc Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 10 五月 2025 10:46:19 +0800
Subject: [PATCH] 1.重命名类名称和文件名；
---
SourceCode/Bond/Servo/Servo.vcxproj | 8 +-
SourceCode/Bond/Servo/PageAlarm.cpp | 62 ++++++++++----------
SourceCode/Bond/Servo/Servo.vcxproj.filters | 8 +-
SourceCode/Bond/Servo/PageLog.h | 10 +-
SourceCode/Bond/Servo/PageLog.cpp | 50 ++++++++--------
SourceCode/Bond/Servo/ServoDlg.cpp | 7 +-
SourceCode/Bond/Servo/PageAlarm.h | 10 +-
SourceCode/Bond/Servo/ServoDlg.h | 8 +-
8 files changed, 81 insertions(+), 82 deletions(-)
diff --git a/SourceCode/Bond/Servo/AlarmDlg.cpp b/SourceCode/Bond/Servo/PageAlarm.cpp
similarity index 88%
rename from SourceCode/Bond/Servo/AlarmDlg.cpp
rename to SourceCode/Bond/Servo/PageAlarm.cpp
index 3ca1d9c..a1d4919 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,7 @@
GetDlgItem(IDC_BUTTON_NEXT_PAGE)->EnableWindow(m_nCurPage < m_nTotalPages);
}
-void CAlarmDlg::FillDataToListCtrl(CListCtrl* pListCtrl, const std::vector<AlarmData>& vecData)
+void CPageAlarm::FillDataToListCtrl(CListCtrl* pListCtrl, const std::vector<AlarmData>& vecData)
{
if (pListCtrl == nullptr || pListCtrl->m_hWnd == nullptr) {
return;
@@ -135,7 +135,7 @@
}
static char* pszAlarmLevel[] = { "Warning", "Error" };
-void CAlarmDlg::InsertAlarmData(CListCtrl* pListCtrl, const AlarmData& alarmData)
+void CPageAlarm::InsertAlarmData(CListCtrl* pListCtrl, const AlarmData& alarmData)
{
if (pListCtrl == nullptr || pListCtrl->m_hWnd == nullptr) {
return;
@@ -160,7 +160,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 +173,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 +182,22 @@
}
-BEGIN_MESSAGE_MAP(CAlarmDlg, CDialogEx)
+BEGIN_MESSAGE_MAP(CPageAlarm, CDialogEx)
ON_WM_CTLCOLOR()
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)
- 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)
END_MESSAGE_MAP()
// CAlarmDlg 娑堟伅澶勭悊绋嬪簭
-BOOL CAlarmDlg::OnInitDialog()
+BOOL CPageAlarm::OnInitDialog()
{
CDialogEx::OnInitDialog();
SetTimer(1, 3000, nullptr);
@@ -259,7 +259,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 +274,7 @@
return m_hbrBkgnd;
}
-void CAlarmDlg::OnDestroy()
+void CPageAlarm::OnDestroy()
{
CDialogEx::OnDestroy();
@@ -302,20 +302,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();
}
-void CAlarmDlg::OnTimer(UINT_PTR nIDEvent)
+void CPageAlarm::OnTimer(UINT_PTR nIDEvent)
{
if (1 == nIDEvent) {
KillTimer(1);
@@ -323,7 +323,7 @@
}
}
-void CAlarmDlg::OnCbnSelchangeComboDatetime()
+void CPageAlarm::OnCbnSelchangeComboDatetime()
{
CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_DATETIME);
int nIndex = pComboBox->GetCurSel();
@@ -332,7 +332,7 @@
m_dateTimeEnd.EnableWindow(nIndex == nCount - 1);
}
-void CAlarmDlg::OnBnClickedButtonSearch()
+void CPageAlarm::OnBnClickedButtonSearch()
{
// 鑾峰彇鍏抽敭瀛�
CString cstrKeyword;
@@ -392,7 +392,7 @@
UpdatePageData(); // 璋冪敤鍒嗛〉鏇存柊鍑芥暟
}
-void CAlarmDlg::OnBnClickedButtonExport()
+void CPageAlarm::OnBnClickedButtonExport()
{
CFileDialog fileDialog(FALSE, "csv", "", OFN_HIDEREADONLY, "csv.files(*.csv)|*.csv||");
if (fileDialog.DoModal() != IDOK) {
@@ -452,14 +452,14 @@
file.Close();
}
-void CAlarmDlg::OnBnClickedButtonPrevPage()
+void CPageAlarm::OnBnClickedButtonPrevPage()
{
// 鐐瑰嚮涓婁竴椤�
m_nCurPage--;
UpdatePageData(); // 璋冪敤鍒嗛〉鏇存柊鍑芥暟
}
-void CAlarmDlg::OnBnClickedButtonNextPage()
+void CPageAlarm::OnBnClickedButtonNextPage()
{
// 鐐瑰嚮涓嬩竴椤�
m_nCurPage++;
diff --git a/SourceCode/Bond/Servo/AlarmDlg.h b/SourceCode/Bond/Servo/PageAlarm.h
similarity index 89%
rename from SourceCode/Bond/Servo/AlarmDlg.h
rename to SourceCode/Bond/Servo/PageAlarm.h
index 0aae170..783ce29 100644
--- a/SourceCode/Bond/Servo/AlarmDlg.h
+++ b/SourceCode/Bond/Servo/PageAlarm.h
@@ -6,15 +6,15 @@
#define ID_MSG_ALARMDLG_HIDE WM_USER + 1024
-// CAlarmDlg 瀵硅瘽妗�
+// CPageAlarm 瀵硅瘽妗�
-class CAlarmDlg : public CDialogEx
+class CPageAlarm : public CDialogEx
{
- DECLARE_DYNAMIC(CAlarmDlg)
+ DECLARE_DYNAMIC(CPageAlarm)
public:
- CAlarmDlg(CWnd* pParent = nullptr); // 鏍囧噯鏋勯�犲嚱鏁�
- virtual ~CAlarmDlg();
+ CPageAlarm(CWnd* pParent = nullptr); // 鏍囧噯鏋勯�犲嚱鏁�
+ virtual ~CPageAlarm();
private:
void InitRxWindow();
diff --git a/SourceCode/Bond/Servo/LogDlg.cpp b/SourceCode/Bond/Servo/PageLog.cpp
similarity index 85%
rename from SourceCode/Bond/Servo/LogDlg.cpp
rename to SourceCode/Bond/Servo/PageLog.cpp
index 5451114..123a5a4 100644
--- a/SourceCode/Bond/Servo/LogDlg.cpp
+++ b/SourceCode/Bond/Servo/PageLog.cpp
@@ -3,17 +3,17 @@
#include "stdafx.h"
#include "Servo.h"
-#include "LogDlg.h"
+#include "PageLog.h"
#include "afxdialogex.h"
#include "Common.h"
#include <regex>
-// CLogDlg 对话框
+// CPageLog 对话框
-IMPLEMENT_DYNAMIC(CLogDlg, CDialogEx)
+IMPLEMENT_DYNAMIC(CPageLog, CDialogEx)
-CLogDlg::CLogDlg(CWnd* pParent /*=NULL*/)
+CPageLog::CPageLog(CWnd* pParent /*=NULL*/)
: CDialogEx(IDD_DIALOG_LOG, pParent)
{
m_crBkgnd = LOGDLG_BACKGROUND_COLOR;
@@ -24,11 +24,11 @@
m_bIncludeRegex = FALSE;
}
-CLogDlg::~CLogDlg()
+CPageLog::~CPageLog()
{
}
-void CLogDlg::DoDataExchange(CDataExchange* pDX)
+void CPageLog::DoDataExchange(CDataExchange* pDX)
{
CDialogEx::DoDataExchange(pDX);
DDX_Control(pDX, IDC_BUTTON_LEVEL, m_btnLevel);
@@ -37,23 +37,23 @@
}
-BEGIN_MESSAGE_MAP(CLogDlg, CDialogEx)
+BEGIN_MESSAGE_MAP(CPageLog, CDialogEx)
ON_WM_CTLCOLOR()
ON_WM_SIZE()
ON_WM_TIMER()
ON_WM_DESTROY()
ON_WM_CLOSE()
- ON_NOTIFY(BLBUTTON_MENU_ITEM_CLICKED, IDC_BUTTON_LEVEL, &CLogDlg::OnButtonLevelMenuClicked)
- ON_NOTIFY(BLBUTTON_MENU_ITEM_CLICKED, IDC_BUTTON_INCLUDE, &CLogDlg::OnButtonIncludeMenuClicked)
- ON_EN_CHANGE(IDC_EDIT_INCLUDE, &CLogDlg::OnEnChangeEditInclude)
- ON_BN_CLICKED(IDC_CHECK_REGEX, &CLogDlg::OnBnClickedCheckRegex)
+ ON_NOTIFY(BLBUTTON_MENU_ITEM_CLICKED, IDC_BUTTON_LEVEL, &CPageLog::OnButtonLevelMenuClicked)
+ ON_NOTIFY(BLBUTTON_MENU_ITEM_CLICKED, IDC_BUTTON_INCLUDE, &CPageLog::OnButtonIncludeMenuClicked)
+ ON_EN_CHANGE(IDC_EDIT_INCLUDE, &CPageLog::OnEnChangeEditInclude)
+ ON_BN_CLICKED(IDC_CHECK_REGEX, &CPageLog::OnBnClickedCheckRegex)
END_MESSAGE_MAP()
// CLogDlg 消息处理程序
-void CLogDlg::InitRxWindow()
+void CPageLog::InitRxWindow()
{
/* code */
// 订阅数据
@@ -103,7 +103,7 @@
}
}
-BOOL CLogDlg::OnInitDialog()
+BOOL CPageLog::OnInitDialog()
{
CDialogEx::OnInitDialog();
SetTimer(1, 3000, nullptr);
@@ -167,14 +167,14 @@
// 异常: OCX 属性页应返回 FALSE
}
-void CLogDlg::OnSize(UINT nType, int cx, int cy)
+void CPageLog::OnSize(UINT nType, int cx, int cy)
{
CDialogEx::OnSize(nType, cx, cy);
if (GetDlgItem(IDC_EDIT_LOG) == nullptr) return;
Resize();
}
-void CLogDlg::OnTimer(UINT_PTR nIDEvent)
+void CPageLog::OnTimer(UINT_PTR nIDEvent)
{
if (1 == nIDEvent) {
KillTimer(1);
@@ -182,7 +182,7 @@
}
}
-void CLogDlg::Resize()
+void CPageLog::Resize()
{
int x, y, y2, temp;
CRect rcClient, rcItem;
@@ -222,7 +222,7 @@
pItem->MoveWindow(x, y2, rcClient.Width() - 16, rcClient.Height() - 5 - y2);
}
-void CLogDlg::OnDestroy()
+void CPageLog::OnDestroy()
{
CDialogEx::OnDestroy();
@@ -250,7 +250,7 @@
}
}
-HBRUSH CLogDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
+HBRUSH CPageLog::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
{
HBRUSH hbr = CDialogEx::OnCtlColor(pDC, pWnd, nCtlColor);
@@ -265,13 +265,13 @@
return m_hbrBkgnd;
}
-void CLogDlg::OnClose()
+void CPageLog::OnClose()
{
ShowWindow(SW_HIDE);
GetParent()->PostMessage(ID_MSG_LOGDLG_HIDE, 0, 0);
}
-BOOL CLogDlg::PreTranslateMessage(MSG* pMsg)
+BOOL CPageLog::PreTranslateMessage(MSG* pMsg)
{
if (pMsg->wParam == VK_RETURN || pMsg->wParam == VK_ESCAPE) {
return TRUE;
@@ -280,7 +280,7 @@
return CDialogEx::PreTranslateMessage(pMsg);
}
-void CLogDlg::AppendLog(int level, const char* pszText)
+void CPageLog::AppendLog(int level, const char* pszText)
{
if (!::IsWindow(m_logEdit.m_hWnd)) {
return;
@@ -288,7 +288,7 @@
m_logEdit.AppendText(pszText);
}
-void CLogDlg::OnButtonLevelMenuClicked(NMHDR* pNMHDR, LRESULT* pResult)
+void CPageLog::OnButtonLevelMenuClicked(NMHDR* pNMHDR, LRESULT* pResult)
{
BLBUTTON_NMHDR* pblbNmhdr = reinterpret_cast<BLBUTTON_NMHDR*>(pNMHDR);
m_nLevel = (int)pblbNmhdr->dwData;
@@ -298,7 +298,7 @@
*pResult = 0;
}
-void CLogDlg::OnButtonIncludeMenuClicked(NMHDR* pNMHDR, LRESULT* pResult)
+void CPageLog::OnButtonIncludeMenuClicked(NMHDR* pNMHDR, LRESULT* pResult)
{
BLBUTTON_NMHDR* pblbNmhdr = reinterpret_cast<BLBUTTON_NMHDR*>(pNMHDR);
int position = (int)pblbNmhdr->dwData;
@@ -314,13 +314,13 @@
*pResult = 0;
}
-void CLogDlg::OnEnChangeEditInclude()
+void CPageLog::OnEnChangeEditInclude()
{
GetDlgItemText(IDC_EDIT_INCLUDE, m_strIncludeText);
theApp.m_model.m_configuration.setLogcatIncludeText(m_strIncludeText);
}
-void CLogDlg::OnBnClickedCheckRegex()
+void CPageLog::OnBnClickedCheckRegex()
{
CButton* pCheckBox = (CButton*)GetDlgItem(IDC_CHECK_REGEX);
m_bIncludeRegex = pCheckBox->GetCheck();
diff --git a/SourceCode/Bond/Servo/LogDlg.h b/SourceCode/Bond/Servo/PageLog.h
similarity index 88%
rename from SourceCode/Bond/Servo/LogDlg.h
rename to SourceCode/Bond/Servo/PageLog.h
index ba35903..8670821 100644
--- a/SourceCode/Bond/Servo/LogDlg.h
+++ b/SourceCode/Bond/Servo/PageLog.h
@@ -7,15 +7,15 @@
#define ID_MSG_LOGDLG_HIDE WM_USER + 1023
-// CLogDlg 对话框
+// CPageLog 对话框
-class CLogDlg : public CDialogEx
+class CPageLog : public CDialogEx
{
- DECLARE_DYNAMIC(CLogDlg)
+ DECLARE_DYNAMIC(CPageLog)
public:
- CLogDlg(CWnd* pParent = NULL); // 标准构造函数
- virtual ~CLogDlg();
+ CPageLog(CWnd* pParent = NULL); // 标准构造函数
+ virtual ~CPageLog();
private:
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj b/SourceCode/Bond/Servo/Servo.vcxproj
index 684b04d..5164232 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj
+++ b/SourceCode/Bond/Servo/Servo.vcxproj
@@ -195,7 +195,7 @@
<Text Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="AlarmDlg.h" />
+ <ClInclude Include="PageAlarm.h" />
<ClInclude Include="AlarmManager.h" />
<ClInclude Include="ApredTreeCtrl2.h" />
<ClInclude Include="BlButton.h" />
@@ -271,7 +271,7 @@
<ClInclude Include="Intent.h" />
<ClInclude Include="ListCtrlEx.h" />
<ClInclude Include="Log.h" />
- <ClInclude Include="LogDlg.h" />
+ <ClInclude Include="PageLog.h" />
<ClInclude Include="LogEdit.h" />
<ClInclude Include="MapPosWnd.h" />
<ClInclude Include="Model.h" />
@@ -290,7 +290,7 @@
<ClInclude Include="VerticalLine.h" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="AlarmDlg.cpp" />
+ <ClCompile Include="PageAlarm.cpp" />
<ClCompile Include="AlarmManager.cpp" />
<ClCompile Include="ApredTreeCtrl2.cpp" />
<ClCompile Include="BlButton.cpp" />
@@ -365,7 +365,7 @@
<ClCompile Include="Intent.cpp" />
<ClCompile Include="ListCtrlEx.cpp" />
<ClCompile Include="Log.cpp" />
- <ClCompile Include="LogDlg.cpp" />
+ <ClCompile Include="PageLog.cpp" />
<ClCompile Include="LogEdit.cpp" />
<ClCompile Include="MapPosWnd.cpp" />
<ClCompile Include="Model.cpp" />
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj.filters b/SourceCode/Bond/Servo/Servo.vcxproj.filters
index 3178d4b..645cae7 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj.filters
+++ b/SourceCode/Bond/Servo/Servo.vcxproj.filters
@@ -14,7 +14,7 @@
<ClCompile Include="HsmsAction.cpp" />
<ClCompile Include="HsmsPassive.cpp" />
<ClCompile Include="Log.cpp" />
- <ClCompile Include="LogDlg.cpp" />
+ <ClCompile Include="PageLog.cpp" />
<ClCompile Include="LogEdit.cpp" />
<ClCompile Include="Model.cpp" />
<ClCompile Include="SecsTestDlg.cpp" />
@@ -40,7 +40,7 @@
<ClCompile Include="CEqModeStep.cpp" />
<ClCompile Include="CEqStatusStep.cpp" />
<ClCompile Include="CEqAlarmStep.cpp" />
- <ClCompile Include="AlarmDlg.cpp" />
+ <ClCompile Include="PageAlarm.cpp" />
<ClCompile Include="CEqProcessStep.cpp" />
<ClCompile Include="CAttribute.cpp" />
<ClCompile Include="CAttributeVector.cpp" />
@@ -111,7 +111,7 @@
<ClInclude Include="HsmsAction.h" />
<ClInclude Include="HsmsPassive.h" />
<ClInclude Include="Log.h" />
- <ClInclude Include="LogDlg.h" />
+ <ClInclude Include="PageLog.h" />
<ClInclude Include="LogEdit.h" />
<ClInclude Include="Model.h" />
<ClInclude Include="Resource.h" />
@@ -139,7 +139,7 @@
<ClInclude Include="CEqModeStep.h" />
<ClInclude Include="CEqStatusStep.h" />
<ClInclude Include="CEqAlarmStep.h" />
- <ClInclude Include="AlarmDlg.h" />
+ <ClInclude Include="PageAlarm.h" />
<ClInclude Include="CEqProcessStep.h" />
<ClInclude Include="CAttribute.h" />
<ClInclude Include="CAttributeVector.h" />
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index 29e60d0..3bf1852 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -9,7 +9,6 @@
#include "Common.h"
#include "Log.h"
#include "SecsTestDlg.h"
-#include "AlarmDlg.h"
#include <chrono>
#include <thread>
#include <cmath>
@@ -218,9 +217,9 @@
m_pPageGraph1->Create(IDD_PAGE_GRAPH1, this);
m_pPageGraph2 = new CPageGraph2();
m_pPageGraph2->Create(IDD_PAGE_GRAPH2, this);
- m_pPageAlarm = new CAlarmDlg();
+ m_pPageAlarm = new CPageAlarm();
m_pPageAlarm->Create(IDD_DIALOG_ALARM, this);
- m_pPageLog = new CLogDlg();
+ m_pPageLog = new CPageLog();
m_pPageLog->Create(IDD_DIALOG_LOG, this);
CHmTab* m_pTab = CHmTab::Hook(GetDlgItem(IDC_TAB1)->m_hWnd);
@@ -645,7 +644,7 @@
LRESULT CServoDlg::OnPanelResize(WPARAM wParam, LPARAM lParam)
{
- int width = wParam;
+ int width = (int)wParam;
// m_pPanel->SetPanelWidth(width);
Resize();
diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index ce6cb8d..9ff5766 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -4,8 +4,8 @@
#pragma once
#include "BlButton.h"
-#include "LogDlg.h"
-#include "AlarmDlg.h"
+#include "PageLog.h"
+#include "PageAlarm.h"
#include "TerminalDisplayDlg.h"
#include "CPanelMaster.h"
#include "CPanelEquipment.h"
@@ -36,8 +36,8 @@
CTerminalDisplayDlg* m_pTerminalDisplayDlg;
CPageGraph1* m_pPageGraph1;
CPageGraph2* m_pPageGraph2;
- CAlarmDlg* m_pPageAlarm;
- CLogDlg* m_pPageLog;
+ CPageAlarm* m_pPageAlarm;
+ CPageLog* m_pPageLog;
// 对话框数据
--
Gitblit v1.9.3