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/ServoDlg.cpp | 217 ++++++++----------------------------------------------
1 files changed, 33 insertions(+), 184 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index 28bbd95..29e60d0 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -68,10 +68,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,6 +75,8 @@
m_pPanelAttributes = nullptr;
m_pPageGraph1 = nullptr;
m_pPageGraph2 = nullptr;
+ m_pPageAlarm = nullptr;
+ m_pPageLog = nullptr;
}
void CServoDlg::DoDataExchange(CDataExchange* pDX)
@@ -96,11 +94,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)
@@ -109,10 +104,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)
@@ -120,8 +111,6 @@
ON_COMMAND(ID_MENU_HELP_ABOUT, &CServoDlg::OnMenuHelpAbout)
ON_WM_INITMENUPOPUP()
ON_WM_TIMER()
- ON_BN_CLICKED(IDC_BUTTON_ALARM, &CServoDlg::OnBnClickedButtonAlarm)
- 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()
@@ -224,18 +213,23 @@
SetMenu(&menu);
-
// Tab
m_pPageGraph1 = new CPageGraph1();
m_pPageGraph1->Create(IDD_PAGE_GRAPH1, this);
m_pPageGraph2 = new CPageGraph2();
m_pPageGraph2->Create(IDD_PAGE_GRAPH2, this);
+ m_pPageAlarm = new CAlarmDlg();
+ m_pPageAlarm->Create(IDD_DIALOG_ALARM, this);
+ m_pPageLog = new CLogDlg();
+ m_pPageLog->Create(IDD_DIALOG_LOG, this);
CHmTab* m_pTab = CHmTab::Hook(GetDlgItem(IDC_TAB1)->m_hWnd);
m_pTab->SetPaddingLeft(20);
m_pTab->SetItemMarginLeft(18);
m_pTab->AddItem("状态图", FALSE);
m_pTab->AddItem("连接图", TRUE);
+ m_pTab->AddItem("报警", TRUE);
+ m_pTab->AddItem("日志", TRUE);
m_pTab->SetCurSel(0);
m_pTab->SetBkgndColor(RGB(222, 222, 222));
ShowChildPage(0);
@@ -249,7 +243,6 @@
m_pPanelAttributes = new CPanelAttributes();
m_pPanelAttributes->Create(IDD_PANEL_ATTRIBUTES, this);
-
// 调整初始窗口位置
CRect rcWnd;
@@ -265,14 +258,15 @@
SetTimer(TIMER_ID_CREATE_TERMINAL, 3000, nullptr);
InitRxWindows();
- OnBnClickedButtonLog();
- UpdateLogBtn();
- UpdateAlarmBtn();
Resize();
// 相当于延时调用master的初始化
theApp.m_model.m_master.init();
+
+
+ // 初始化master以后需要控件绑定数据
+ m_pPageGraph1->BindEquipmentToGraph();
return TRUE; // 除非将焦点设置到控件，否则返回 TRUE
@@ -419,26 +413,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);
@@ -516,17 +490,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();
@@ -564,6 +527,18 @@
m_pPageGraph2 = nullptr;
}
+ if (m_pPageAlarm != nullptr) {
+ m_pPageAlarm->DestroyWindow();
+ delete m_pPageAlarm;
+ m_pPageAlarm = nullptr;
+ }
+
+ if (m_pPageLog != nullptr) {
+ m_pPageLog->DestroyWindow();
+ delete m_pPageLog;
+ m_pPageLog = nullptr;
+ }
+
if (m_hbrBkgnd != nullptr) {
::DeleteObject(m_hbrBkgnd);
}
@@ -575,92 +550,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_pPageAlarm == nullptr) return;
+ if (m_pPageLog == nullptr) return;
Resize();
Invalidate();
@@ -701,21 +598,10 @@
y += rcItem.Height();
- m_pPageGraph1->MoveWindow(x, y, rcClient.Width() - x, rcClient.Height());
- m_pPageGraph2->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()
@@ -725,32 +611,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);
@@ -758,17 +618,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);
}
@@ -813,9 +662,9 @@
void CServoDlg::ShowChildPage(int index)
{
- ASSERT(0 <= index && index < 3);
- static CWnd* pPages[] = { m_pPageGraph1, m_pPageGraph2 };
- for (int i = 0; i < 2; i++) {
+ ASSERT(0 <= index && index < 4);
+ 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