From 24e3d5124ed62ebd613ba883a366ea3461c9dd17 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 11 三月 2025 11:30:13 +0800
Subject: [PATCH] 1.CMFCPropertyGridCtrl控件调整，使单元项可选，不可编辑。
---
SourceCode/Bond/Servo/ServoDlg.cpp | 66 ++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 14 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index 90ee383..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);
@@ -626,6 +638,35 @@
}
+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;
@@ -645,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();
}
@@ -812,6 +855,7 @@
CDialogEx::OnSize(nType, cx, cy);
if (GetDlgItem(IDC_SERVO_GRAPH1) == nullptr) return;
Resize();
+ Invalidate();
}
void CServoDlg::Resize()
@@ -848,14 +892,16 @@
y += rcItem.Height();
y += 8;
- x = 8;
+ 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;
- x = 20 + rcItem.Width();
pItem = GetDlgItem(IDC_BUTTON_ALARM);
pItem->GetClientRect(&rcItem);
+ x -= rcItem.Width();
pItem->MoveWindow(x, rcClient.bottom - 8 - rcItem.Height(), rcItem.Width(), rcItem.Height());
}
@@ -902,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);
@@ -945,14 +991,6 @@
}
return CDialogEx::OnEraseBkgnd(pDC);
-}
-
-
-void CServoDlg::OnBnClickedButtonAlarm()
-{
- // TODO: 在此添加控件通知处理程序代码
- CAlarmDlg dlg;
- dlg.DoModal();
}
void CServoDlg::OnGraphItemClicked(NMHDR* pNMHDR, LRESULT* pResult)
--
Gitblit v1.9.3