From 90397e38de383d85fad48da15fa4386d479deb7b Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 10 三月 2025 17:15:56 +0800
Subject: [PATCH] 1.调整日志窗口和报警窗口界面
---
SourceCode/Bond/Servo/ServoDlg.cpp | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index 3bfbe09..bfed47e 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -126,6 +126,8 @@
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_HELP_ABOUT, &CServoDlg::OnMenuHelpAbout)
ON_WM_INITMENUPOPUP()
ON_WM_TIMER()
@@ -530,6 +532,16 @@
pCmdUI->SetCheck(m_bShowLogWnd);
}
+void CServoDlg::OnMenuWndAlarm()
+{
+ OnBnClickedButtonAlarm();
+}
+
+void CServoDlg::OnUpdateMenuWndAlarm(CCmdUI* pCmdUI)
+{
+ pCmdUI->SetCheck(m_bShowAlarmWnd);
+}
+
void CServoDlg::OnMenuFileExit()
{
PostMessage(WM_CLOSE);
@@ -645,7 +657,8 @@
CRect rcWnd;
GetWindowRect(&rcWnd);
- m_pAlarmDlg->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), 200);
+ int nHeight = GetSystemMetrics(SM_CYSCREEN) - rcWnd.bottom - 38;
+ m_pAlarmDlg->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), nHeight);
}
ASSERT(m_pAlarmDlg);
m_pAlarmDlg->ShowWindow(m_bShowAlarmWnd ? SW_SHOW : SW_HIDE);
@@ -672,7 +685,8 @@
CRect rcWnd;
GetWindowRect(&rcWnd);
- m_pLogDlg->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), 200);
+ int nHeight = GetSystemMetrics(SM_CYSCREEN) - rcWnd.bottom - 38;
+ m_pLogDlg->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), nHeight);
}
ASSERT(m_pLogDlg);
m_pLogDlg->ShowWindow(m_bShowLogWnd ? SW_SHOW : SW_HIDE);
--
Gitblit v1.9.3