From c6bfb4fc0801c4cb1f9dd2128df5f20d2e9cf27d Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 13 一月 2025 11:33:36 +0800
Subject: [PATCH] 1.PLC名字显示,按钮边框等;
---
SourceCode/Bond/Servo/ServoDlg.cpp | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 202 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index a4f5ae8..7d7b5ad 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -7,6 +7,8 @@
#include "ServoDlg.h"
#include "afxdialogex.h"
#include "Common.h"
+#include "Log.h"
+#include "SecsTestDlg.h"
#ifdef _DEBUG
@@ -73,6 +75,7 @@
m_crBkgnd = APPDLG_BACKGROUND_COLOR;
m_hbrBkgnd = nullptr;
m_bShowLogWnd = FALSE;
+ m_pLogDlg = nullptr;
}
void CServoDlg::DoDataExchange(CDataExchange* pDX)
@@ -91,6 +94,20 @@
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_WM_MOVING()
+ ON_WM_MOVE()
+ ON_COMMAND(ID_MENU_FILE_EXIT, &CServoDlg::OnMenuFileExit)
+ ON_UPDATE_COMMAND_UI(ID_MENU_FILE_EXIT, &CServoDlg::OnUpdateMenuFileExit)
+ ON_COMMAND(ID_MENU_FILE_SETTINGS, &CServoDlg::OnMenuFileSettings)
+ 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_HELP_ABOUT, &CServoDlg::OnMenuHelpAbout)
+ ON_WM_INITMENUPOPUP()
END_MESSAGE_MAP()
@@ -124,6 +141,13 @@
// 执行此操作
SetIcon(m_hIcon, TRUE); // 设置大图标
SetIcon(m_hIcon, FALSE); // 设置小图标
+
+
+ // 菜单
+ CMenu menu;
+ menu.LoadMenu(IDR_MENU_APP);
+ SetMenu(&menu);
+
// 图示
@@ -206,6 +230,18 @@
m_pGraph->SetBoxText(INDICATE_MEASUREMENT, "13", "Measurement");
+ // 调整初始窗口位置
+ CRect rcWnd;
+ GetWindowRect(&rcWnd);
+ int width = GetSystemMetrics(SM_CXSCREEN);
+ int height = GetSystemMetrics(SM_CYSCREEN);
+ MoveWindow((width - rcWnd.Width()) / 2, 0, rcWnd.Width(), rcWnd.Height(), TRUE);
+
+
+ // model init
+ theApp.m_model.init();
+
+
UpdateLogBtn();
Resize();
return TRUE; // 除非将焦点设置到控件,否则返回 TRUE
@@ -260,7 +296,123 @@
return static_cast<HCURSOR>(m_hIcon);
}
+void CServoDlg::OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu)
+{
+ ASSERT(pPopupMenu != NULL);
+ CCmdUI state;
+ state.m_pMenu = pPopupMenu;
+ ASSERT(state.m_pOther == NULL);
+ ASSERT(state.m_pParentMenu == NULL);
+
+ HMENU hParentMenu;
+ if (AfxGetThreadState()->m_hTrackingMenu == pPopupMenu->m_hMenu)
+ state.m_pParentMenu = pPopupMenu;
+ else if ((hParentMenu = ::GetMenu(m_hWnd)) != NULL)
+ {
+ CWnd* pParent = this;
+ if (pParent != NULL &&
+ (hParentMenu = ::GetMenu(pParent->m_hWnd)) != NULL)
+ {
+ int nIndexMax = ::GetMenuItemCount(hParentMenu);
+ for (int nIndex = 0; nIndex < nIndexMax; nIndex++)
+ {
+ if (::GetSubMenu(hParentMenu, nIndex) == pPopupMenu->m_hMenu)
+ {
+ state.m_pParentMenu = CMenu::FromHandle(hParentMenu);
+ break;
+ }
+ }
+ }
+ }
+
+ state.m_nIndexMax = pPopupMenu->GetMenuItemCount();
+ for (state.m_nIndex = 0; state.m_nIndex < state.m_nIndexMax;
+ state.m_nIndex++)
+ {
+ state.m_nID = pPopupMenu->GetMenuItemID(state.m_nIndex);
+ if (state.m_nID == 0)
+ continue;
+
+ ASSERT(state.m_pOther == NULL);
+ ASSERT(state.m_pMenu != NULL);
+ if (state.m_nID == (UINT)-1)
+ {
+ state.m_pSubMenu = pPopupMenu->GetSubMenu(state.m_nIndex);
+ if (state.m_pSubMenu == NULL ||
+ (state.m_nID = state.m_pSubMenu->GetMenuItemID(0)) == 0 ||
+ state.m_nID == (UINT)-1)
+ {
+ continue;
+ }
+ state.DoUpdate(this, TRUE);
+ }
+ else
+ {
+ state.m_pSubMenu = NULL;
+ state.DoUpdate(this, FALSE);
+ }
+
+ UINT nCount = pPopupMenu->GetMenuItemCount();
+ if (nCount < state.m_nIndexMax)
+ {
+ state.m_nIndex -= (state.m_nIndexMax - nCount);
+ while (state.m_nIndex < nCount &&
+ pPopupMenu->GetMenuItemID(state.m_nIndex) == state.m_nID)
+ {
+ state.m_nIndex++;
+ }
+ }
+ state.m_nIndexMax = nCount;
+ }
+}
+
+void CServoDlg::OnMenuFileSettings()
+{
+
+}
+
+void CServoDlg::OnUpdateMenuFileSettings(CCmdUI* pCmdUI)
+{
+ pCmdUI->Enable(TRUE);
+}
+
+void CServoDlg::OnMenuFileSecsTest()
+{
+ CSecsTestDlg dlg;
+ dlg.DoModal();
+}
+
+void CServoDlg::OnUpdateMenuFileSecsTest(CCmdUI* pCmdUI)
+{
+ pCmdUI->Enable(TRUE);
+}
+
+void CServoDlg::OnMenuWndLog()
+{
+ OnBnClickedButtonLog();
+}
+
+void CServoDlg::OnUpdateMenuWndLog(CCmdUI* pCmdUI)
+{
+ pCmdUI->SetCheck(m_bShowLogWnd);
+}
+
+void CServoDlg::OnMenuFileExit()
+{
+ PostMessage(WM_CLOSE);
+}
+
+void CServoDlg::OnUpdateMenuFileExit(CCmdUI* pCmdUI)
+{
+ pCmdUI->Enable(TRUE);
+}
+
+void CServoDlg::OnMenuHelpAbout()
+{
+ CAboutDlg dlgAbout;
+ dlgAbout.DoModal();
+}
void CServoDlg::OnBnClickedOk()
{
@@ -295,6 +447,12 @@
{
CDialogEx::OnDestroy();
+ if (m_pLogDlg != nullptr) {
+ m_pLogDlg->DestroyWindow();
+ delete m_pLogDlg;
+ m_pLogDlg = nullptr;
+ }
+
if (m_hbrBkgnd != nullptr) {
::DeleteObject(m_hbrBkgnd);
}
@@ -303,6 +461,17 @@
void CServoDlg::OnBnClickedButtonLog()
{
m_bShowLogWnd = !m_bShowLogWnd;
+ if (m_pLogDlg == nullptr) {
+ m_pLogDlg = new CLogDlg();
+ m_pLogDlg->Create(IDD_DIALOG_LOG, this);
+
+ CRect rcWnd;
+ GetWindowRect(&rcWnd);
+ m_pLogDlg->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), 200);
+ }
+ ASSERT(m_pLogDlg);
+ m_pLogDlg->ShowWindow(m_bShowLogWnd ? SW_SHOW : SW_HIDE);
+
UpdateLogBtn();
}
@@ -314,6 +483,7 @@
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::OnSize(UINT nType, int cx, int cy)
@@ -342,3 +512,35 @@
pItem->GetClientRect(&rcItem);
pItem->MoveWindow(x, y, rcItem.Width(), rcItem.Height());
}
+
+void CServoDlg::OnClose()
+{
+ // TODO: 在此添加消息处理程序代码和/或调用默认值
+
+ CDialogEx::OnClose();
+}
+
+LRESULT CServoDlg::OnLogDlgHide(WPARAM wParam, LPARAM lParam)
+{
+ m_bShowLogWnd = FALSE;
+ UpdateLogBtn();
+ LOGE("OnLogDlgHide");
+
+ return 0;
+}
+
+void CServoDlg::OnMoving(UINT fwSide, LPRECT pRect)
+{
+ CDialogEx::OnMoving(fwSide, pRect);
+}
+
+void CServoDlg::OnMove(int x, int y)
+{
+ if (m_pLogDlg != nullptr && !m_pLogDlg->IsZoomed()) {
+ CRect rcWnd;
+ GetWindowRect(&rcWnd);
+ m_pLogDlg->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), 200);
+ }
+
+ CDialogEx::OnMove(x, y);
+}
--
Gitblit v1.9.3