From 74c5b2d3f2073a600c458b77acbef4463326c12a Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 11 三月 2025 11:50:12 +0800
Subject: [PATCH] 1.更换图标；
---
SourceCode/Bond/Servo/ServoDlg.cpp | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index 3bfbe09..b29713e 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,9 @@
CRect rcWnd;
GetWindowRect(&rcWnd);
- m_pAlarmDlg->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), 200);
+ 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);
@@ -672,11 +686,13 @@
CRect rcWnd;
GetWindowRect(&rcWnd);
- m_pLogDlg->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), 200);
+ 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();
}
@@ -839,6 +855,7 @@
CDialogEx::OnSize(nType, cx, cy);
if (GetDlgItem(IDC_SERVO_GRAPH1) == nullptr) return;
Resize();
+ Invalidate();
}
void CServoDlg::Resize()
@@ -931,13 +948,13 @@
if (m_pLogDlg != nullptr && !m_pLogDlg->IsZoomed()) {
CRect rcWnd;
GetWindowRect(&rcWnd);
- m_pLogDlg->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), 200);
+ 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->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), 200);
+ m_pAlarmDlg->SetWindowPos(nullptr, rcWnd.left, rcWnd.bottom - 8, 0, 0, SWP_NOSIZE);
}
CDialogEx::OnMove(x, y);
--
Gitblit v1.9.3