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/ServoDlg.cpp | 225 ++++++--------------------------------------------------
1 files changed, 24 insertions(+), 201 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index 0a15903..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>
@@ -68,10 +67,6 @@
m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
m_crBkgnd = APPDLG_BACKGROUND_COLOR;
m_hbrBkgnd = nullptr;
- //m_bShowLogWnd = FALSE;
- //m_bShowAlarmWnd = FALSE;
- //m_pLogDlg = nullptr;
- //m_pAlarmDlg = nullptr;
m_pTerminalDisplayDlg = nullptr;
m_pObserver = nullptr;
m_pPanelMaster = nullptr;
@@ -79,15 +74,15 @@
m_pPanelAttributes = nullptr;
m_pPageGraph1 = nullptr;
m_pPageGraph2 = nullptr;
- m_pPageGraph3 = nullptr;
- m_pPageGraph4 = nullptr;
+ m_pPageAlarm = nullptr;
+ m_pPageLog = nullptr;
}
void CServoDlg::DoDataExchange(CDataExchange* pDX)
{
CDialogEx::DoDataExchange(pDX);
- //DDX_Control(pDX, IDC_BUTTON_LOG, m_btnLog);
- //DDX_Control(pDX, IDC_BUTTON_ALARM, m_btnAlarm);
+ DDX_Control(pDX, IDC_BUTTON_LOG, m_btnLog);
+ DDX_Control(pDX, IDC_BUTTON_ALARM, m_btnAlarm);
}
BEGIN_MESSAGE_MAP(CServoDlg, CDialogEx)
@@ -98,11 +93,8 @@
ON_BN_CLICKED(IDCANCEL, &CServoDlg::OnBnClickedCancel)
ON_WM_CTLCOLOR()
ON_WM_DESTROY()
- //ON_BN_CLICKED(IDC_BUTTON_LOG, &CServoDlg::OnBnClickedButtonLog)
ON_WM_SIZE()
ON_WM_CLOSE()
- //ON_MESSAGE(ID_MSG_LOGDLG_HIDE, &CServoDlg::OnLogDlgHide)
- //ON_MESSAGE(ID_MSG_ALARMDLG_HIDE, &CServoDlg::OnAlarmDlgHide)
ON_WM_MOVING()
ON_WM_MOVE()
ON_COMMAND(ID_MENU_FILE_EXIT, &CServoDlg::OnMenuFileExit)
@@ -111,10 +103,6 @@
ON_UPDATE_COMMAND_UI(ID_MENU_FILE_SETTINGS, &CServoDlg::OnUpdateMenuFileSettings)
ON_COMMAND(ID_MENU_FILE_SECSTEST, &CServoDlg::OnMenuFileSecsTest)
ON_UPDATE_COMMAND_UI(ID_MENU_FILE_SECSTEST, &CServoDlg::OnUpdateMenuFileSecsTest)
- //ON_COMMAND(ID_MENU_WND_LOG, &CServoDlg::OnMenuWndLog)
- //ON_UPDATE_COMMAND_UI(ID_MENU_WND_LOG, &CServoDlg::OnUpdateMenuWndLog)
- //ON_COMMAND(ID_MENU_WND_ALARM, &CServoDlg::OnMenuWndAlarm)
- //ON_UPDATE_COMMAND_UI(ID_MENU_WND_ALARM, &CServoDlg::OnUpdateMenuWndAlarm)
ON_COMMAND(ID_MENU_TEST_MESSAGE_SET, &CServoDlg::OnMenuTestMessageSet)
ON_UPDATE_COMMAND_UI(ID_MENU_TEST_MESSAGE_SET, &CServoDlg::OnUpdateMenuTestMessageSet)
ON_COMMAND(ID_MENU_TEST_MESSAGE_CLEAR, &CServoDlg::OnMenuTestMessageClear)
@@ -122,7 +110,6 @@
ON_COMMAND(ID_MENU_HELP_ABOUT, &CServoDlg::OnMenuHelpAbout)
ON_WM_INITMENUPOPUP()
ON_WM_TIMER()
- //ON_BN_CLICKED(IDC_BUTTON_ALARM, &CServoDlg::OnBnClickedButtonAlarm)
ON_MESSAGE(ID_MSG_PANEL_RESIZE, OnPanelResize)
ON_NOTIFY(BYHMTAB_SEL_CHANGED, IDC_TAB1, &CServoDlg::OnTabSelChanged)
END_MESSAGE_MAP()
@@ -230,10 +217,10 @@
m_pPageGraph1->Create(IDD_PAGE_GRAPH1, this);
m_pPageGraph2 = new CPageGraph2();
m_pPageGraph2->Create(IDD_PAGE_GRAPH2, this);
- m_pPageGraph3 = new CAlarmDlg();
- m_pPageGraph3->Create(IDD_DIALOG_ALARM, this);
- m_pPageGraph4 = new CLogDlg();
- m_pPageGraph4->Create(IDD_DIALOG_LOG, this);
+ m_pPageAlarm = new CPageAlarm();
+ m_pPageAlarm->Create(IDD_DIALOG_ALARM, this);
+ m_pPageLog = new CPageLog();
+ m_pPageLog->Create(IDD_DIALOG_LOG, this);
CHmTab* m_pTab = CHmTab::Hook(GetDlgItem(IDC_TAB1)->m_hWnd);
m_pTab->SetPaddingLeft(20);
@@ -270,9 +257,6 @@
SetTimer(TIMER_ID_CREATE_TERMINAL, 3000, nullptr);
InitRxWindows();
- //OnBnClickedButtonLog();
- //UpdateLogBtn();
- //UpdateAlarmBtn();
Resize();
@@ -428,26 +412,6 @@
pCmdUI->Enable(TRUE);
}
-//void CServoDlg::OnMenuWndLog()
-//{
-// OnBnClickedButtonLog();
-//}
-
-//void CServoDlg::OnUpdateMenuWndLog(CCmdUI* pCmdUI)
-//{
-// pCmdUI->SetCheck(m_bShowLogWnd);
-//}
-
-//void CServoDlg::OnMenuWndAlarm()
-//{
-// OnBnClickedButtonAlarm();
-//}
-
-//void CServoDlg::OnUpdateMenuWndAlarm(CCmdUI* pCmdUI)
-//{
-// pCmdUI->SetCheck(m_bShowAlarmWnd);
-//}
-
void CServoDlg::OnMenuFileExit()
{
PostMessage(WM_CLOSE);
@@ -525,17 +489,6 @@
{
CDialogEx::OnDestroy();
- //if (m_pLogDlg != nullptr) {
- // m_pLogDlg->DestroyWindow();
- // delete m_pLogDlg;
- // m_pLogDlg = nullptr;
- //}
-
- //if (m_pAlarmDlg != nullptr) {
- // m_pAlarmDlg->DestroyWindow();
- // delete m_pAlarmDlg;
- // m_pAlarmDlg = nullptr;
- //}
if (m_pTerminalDisplayDlg != nullptr) {
m_pTerminalDisplayDlg->DestroyWindow();
@@ -573,16 +526,16 @@
m_pPageGraph2 = nullptr;
}
- if (m_pPageGraph3 != nullptr) {
- m_pPageGraph3->DestroyWindow();
- delete m_pPageGraph3;
- m_pPageGraph3 = nullptr;
+ if (m_pPageAlarm != nullptr) {
+ m_pPageAlarm->DestroyWindow();
+ delete m_pPageAlarm;
+ m_pPageAlarm = nullptr;
}
- if (m_pPageGraph4 != nullptr) {
- m_pPageGraph4->DestroyWindow();
- delete m_pPageGraph4;
- m_pPageGraph4 = nullptr;
+ if (m_pPageLog != nullptr) {
+ m_pPageLog->DestroyWindow();
+ delete m_pPageLog;
+ m_pPageLog = nullptr;
}
if (m_hbrBkgnd != nullptr) {
@@ -596,94 +549,14 @@
}
-//void CServoDlg::OnBnClickedButtonAlarm()
-//{
-// m_bShowAlarmWnd = !m_bShowAlarmWnd;
-//
-// // 如果要显示报警窗口，则隐藏日志窗口
-// if (m_bShowLogWnd) {
-// m_bShowLogWnd = false;
-// if (m_pLogDlg != nullptr) {
-// m_pLogDlg->ShowWindow(SW_HIDE);
-// UpdateLogBtn();
-// }
-// }
-//
-// if (m_pAlarmDlg == nullptr) {
-// m_pAlarmDlg = new CAlarmDlg();
-// m_pAlarmDlg->Create(IDD_DIALOG_ALARM, this);
-//
-// CRect rcWnd;
-// GetWindowRect(&rcWnd);
-// int nHeight = GetSystemMetrics(SM_CYSCREEN) - rcWnd.bottom - 38;
-// if (nHeight < 280) nHeight = 280;
-// m_pAlarmDlg->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), nHeight);
-// }
-// ASSERT(m_pAlarmDlg);
-// m_pAlarmDlg->ShowWindow(m_bShowAlarmWnd ? SW_SHOW : SW_HIDE);
-//
-// UpdateAlarmBtn();
-//}
-
-//void CServoDlg::OnBnClickedButtonLog()
-//{
-// m_bShowLogWnd = !m_bShowLogWnd;
-//
-// // 如果要显示日志窗口，则隐藏报警窗口
-// if (m_bShowLogWnd) {
-// m_bShowAlarmWnd = false;
-// if (m_pAlarmDlg != nullptr) {
-// m_pAlarmDlg->ShowWindow(SW_HIDE);
-// UpdateAlarmBtn();
-// }
-// }
-//
-// if (m_pLogDlg == nullptr) {
-// m_pLogDlg = new CLogDlg();
-// m_pLogDlg->Create(IDD_DIALOG_LOG, this);
-//
-// CRect rcWnd;
-// GetWindowRect(&rcWnd);
-// int nHeight = GetSystemMetrics(SM_CYSCREEN) - rcWnd.bottom - 38;
-// if (nHeight < 280) nHeight = 280;
-// m_pLogDlg->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), nHeight);
-// }
-// ASSERT(m_pLogDlg);
-// m_pLogDlg->ShowWindow(m_bShowLogWnd ? SW_SHOW : SW_HIDE);
-//
-// UpdateLogBtn();
-//}
-
-//void CServoDlg::UpdateLogBtn()
-//{
-// m_btnLog.SetFrameColor(BS_NORMAL, BTN_LOG_FRAME_NORMAL);
-// m_btnLog.SetFrameColor(BS_HOVER, BTN_LOG_FRAME_HOVER);
-// m_btnLog.SetFrameColor(BS_PRESS, BTN_LOG_FRAME_PRESS);
-// m_btnLog.SetBkgndColor(BS_NORMAL, m_bShowLogWnd ? BTN_LOG_BKGND_PRESS : BTN_LOG_BKGND_NORMAL);
-// m_btnLog.SetBkgndColor(BS_HOVER, BTN_LOG_BKGND_HOVER);
-// m_btnLog.SetBkgndColor(BS_PRESS, BTN_LOG_BKGND_PRESS);
-// m_btnLog.Invalidate();
-//}
-
-//void CServoDlg::UpdateAlarmBtn()
-//{
-// m_btnAlarm.SetFrameColor(BS_NORMAL, BTN_ALARM_FRAME_NORMAL);
-// m_btnAlarm.SetFrameColor(BS_HOVER, BTN_ALARM_FRAME_HOVER);
-// m_btnAlarm.SetFrameColor(BS_PRESS, BTN_ALARM_FRAME_PRESS);
-// m_btnAlarm.SetBkgndColor(BS_NORMAL, m_bShowAlarmWnd ? BTN_ALARM_BKGND_PRESS : BTN_ALARM_BKGND_NORMAL);
-// m_btnAlarm.SetBkgndColor(BS_HOVER, BTN_ALARM_BKGND_HOVER);
-// m_btnAlarm.SetBkgndColor(BS_PRESS, BTN_ALARM_BKGND_PRESS);
-// m_btnAlarm.Invalidate();
-//}
-
void CServoDlg::OnSize(UINT nType, int cx, int cy)
{
CDialogEx::OnSize(nType, cx, cy);
if (GetDlgItem(IDC_TAB1) == nullptr) return;
if (m_pPageGraph1 == nullptr) return;
if (m_pPageGraph2 == nullptr) return;
- if (m_pPageGraph3 == nullptr) return;
- if (m_pPageGraph4 == nullptr) return;
+ if (m_pPageAlarm == nullptr) return;
+ if (m_pPageLog == nullptr) return;
Resize();
Invalidate();
@@ -724,23 +597,10 @@
y += rcItem.Height();
- m_pPageGraph1->MoveWindow(x, y, rcClient.Width() - x, rcClient.Height());
- m_pPageGraph2->MoveWindow(x, y, rcClient.Width() - x, rcClient.Height());
- m_pPageGraph3->MoveWindow(x, y, rcClient.Width() - x, rcClient.Height());
- m_pPageGraph4->MoveWindow(x, y, rcClient.Width() - x, rcClient.Height());
-
-
- //x = rcClient.right - 8;
- //pItem = GetDlgItem(IDC_BUTTON_LOG);
- //pItem->GetClientRect(&rcItem);
- //x -= rcItem.Width();
- //pItem->MoveWindow(x, rcClient.bottom - 8 - rcItem.Height(), rcItem.Width(), rcItem.Height());
- //x -= 8;
-
- //pItem = GetDlgItem(IDC_BUTTON_ALARM);
- //pItem->GetClientRect(&rcItem);
- //x -= rcItem.Width();
- //pItem->MoveWindow(x, rcClient.bottom - 8 - rcItem.Height(), rcItem.Width(), rcItem.Height());
+ m_pPageGraph1->MoveWindow(x, y, rcClient.Width() - x, rcClient.Height() - y);
+ m_pPageGraph2->MoveWindow(x, y, rcClient.Width() - x, rcClient.Height() - y);
+ m_pPageAlarm->MoveWindow(x, y, rcClient.Width() - x, rcClient.Height() - y);
+ m_pPageLog->MoveWindow(x, y, rcClient.Width() - x, rcClient.Height() - y);
}
void CServoDlg::OnClose()
@@ -750,32 +610,6 @@
CDialogEx::OnClose();
}
-//LRESULT CServoDlg::OnLogDlgHide(WPARAM wParam, LPARAM lParam)
-//{
-// m_bShowLogWnd = FALSE;
-// UpdateLogBtn();
-// LOGE("OnLogDlgHide");
-//
-// unsigned int DATAID, RPTID;
-// DATAID = 111;
-// RPTID = 1001;
-// std::vector<std::string> v;
-// v.push_back("abc");
-// v.push_back("def");
-// theApp.m_model.m_hsmsPassive.requestEventReportSend(DATAID, RPTID, v);
-//
-// return 0;
-//}
-
-//LRESULT CServoDlg::OnAlarmDlgHide(WPARAM wParam, LPARAM lParam)
-//{
-// m_bShowAlarmWnd = FALSE;
-// UpdateAlarmBtn();
-// LOGE("OnAlarmDlgHide");
-//
-// return 0;
-//}
-
void CServoDlg::OnMoving(UINT fwSide, LPRECT pRect)
{
CDialogEx::OnMoving(fwSide, pRect);
@@ -783,17 +617,6 @@
void CServoDlg::OnMove(int x, int y)
{
- //if (m_pLogDlg != nullptr && !m_pLogDlg->IsZoomed()) {
- // CRect rcWnd;
- // GetWindowRect(&rcWnd);
- // m_pLogDlg->SetWindowPos(nullptr, rcWnd.left, rcWnd.bottom - 8, 0, 0, SWP_NOSIZE);
- //}
-
- //if (m_pAlarmDlg != nullptr && !m_pAlarmDlg->IsZoomed()) {
- // CRect rcWnd;
- // GetWindowRect(&rcWnd);
- // m_pAlarmDlg->SetWindowPos(nullptr, rcWnd.left, rcWnd.bottom - 8, 0, 0, SWP_NOSIZE);
- //}
CDialogEx::OnMove(x, y);
}
@@ -821,7 +644,7 @@
LRESULT CServoDlg::OnPanelResize(WPARAM wParam, LPARAM lParam)
{
- int width = wParam;
+ int width = (int)wParam;
// m_pPanel->SetPanelWidth(width);
Resize();
@@ -839,7 +662,7 @@
void CServoDlg::ShowChildPage(int index)
{
ASSERT(0 <= index && index < 4);
- static CWnd* pPages[] = { m_pPageGraph1, m_pPageGraph2, m_pPageGraph3, m_pPageGraph4 };
+ static CWnd* pPages[] = { m_pPageGraph1, m_pPageGraph2, m_pPageAlarm, m_pPageLog };
for (int i = 0; i < 4; i++) {
pPages[i]->ShowWindow(i == index ? SW_SHOW : SW_HIDE);
}
--
Gitblit v1.9.3