From 16b9bfc152d83d615aeaad8646b5fcc7cbccfdd4 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期二, 19 十一月 2024 13:37:59 +0800
Subject: [PATCH] 1. 添加角色描述 2. 修改用户管理列表的属性
---
SourceCode/Bond/BondEq/BondEqDlg.cpp | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEqDlg.cpp b/SourceCode/Bond/BondEq/BondEqDlg.cpp
index 62305d3..0860fa8 100644
--- a/SourceCode/Bond/BondEq/BondEqDlg.cpp
+++ b/SourceCode/Bond/BondEq/BondEqDlg.cpp
@@ -7,10 +7,14 @@
#include "BondEqDlg.h"
#include "afxdialogex.h"
#include "Common.h"
-#include "Servo.h"
+#include "CBonder.h"
#include "SettingsDlg.h"
#include "UserManager.h"
#include "LoginDlg.h"
+
+// test
+#include "AxisSettingsDlg.h"
+#include "UserManagerDlg.h"
#ifdef _DEBUG
@@ -195,6 +199,9 @@
m_pTopToolbar->Create(IDD_TOP_TOOLBAR, this);
m_pTopToolbar->ShowWindow(SW_SHOW);
m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
+ HMENU hMenu = m_pTopToolbar->GetOperatorMenu();
+ ASSERT(hMenu);
+ ::EnableMenuItem(hMenu, ID_OPEATOR_SWITCH, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
// 设备面板
@@ -212,7 +219,6 @@
// Home页
m_pHomeDialog = CreateHomeDlg();
ShowWindow(SW_SHOWMAXIMIZED);
- SetTimer(2, 1000, nullptr);
InitRxWindows();
@@ -279,8 +285,8 @@
void CBondEqDlg::OnClose()
{
// TODO: 在此添加消息处理程序代码和/或调用默认值
- CServo& servo = theApp.m_model.getServo();
- if (servo.isRunning()) {
+ CBonder& bonder = theApp.m_model.getBonder();
+ if (bonder.isRunning()) {
AfxMessageBox("程序和机器正在运行中，请先停止工作再退出程序！");
return;
}
@@ -453,7 +459,7 @@
void CBondEqDlg::OnUpdateMenuFileSettings(CCmdUI* pCmdUI)
{
- pCmdUI->Enable(!theApp.m_model.getServo().isRunning());
+ pCmdUI->Enable(!theApp.m_model.getBonder().isRunning());
}
void CBondEqDlg::OnMenuFileExit()
@@ -463,7 +469,7 @@
void CBondEqDlg::OnUpdateMenuFileExit(CCmdUI* pCmdUI)
{
- pCmdUI->Enable(!theApp.m_model.getServo().isRunning());
+ pCmdUI->Enable(!theApp.m_model.getBonder().isRunning());
}
void CBondEqDlg::OnMenuHelpAbout()
@@ -532,10 +538,14 @@
ShowLoginDlg();
}
else if (2 == menuId) {
- if (userManager.isLoggedIn()) {
- userManager.logout();
- m_pTopToolbar->SetOperatorBtnText(_T("未登录"));
- }
+ // test
+ CUserManagerDlg dlg;
+ dlg.DoModal();
+
+ //if (userManager.isLoggedIn()) {
+ // userManager.logout();
+ // m_pTopToolbar->SetOperatorBtnText(_T("未登录"));
+ //}
}
}
@@ -578,10 +588,7 @@
}
}
}
- else if (2 == nIDEvent) {
- KillTimer(2);
- theApp.m_model.createRemoteEqs();
- }
+
CDialogEx::OnTimer(nIDEvent);
}
--
Gitblit v1.9.3