From e5d448c95b18b46068453fa95527f1de1f7f0d45 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 02 十二月 2024 08:29:28 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh
---
SourceCode/Bond/BondEq/BondEqDlg.cpp | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEqDlg.cpp b/SourceCode/Bond/BondEq/BondEqDlg.cpp
index 70fa037..0df941d 100644
--- a/SourceCode/Bond/BondEq/BondEqDlg.cpp
+++ b/SourceCode/Bond/BondEq/BondEqDlg.cpp
@@ -14,6 +14,7 @@
// test
#include "AxisSettingsDlg.h"
+#include "UserManagerDlg.h"
#ifdef _DEBUG
@@ -452,8 +453,14 @@
void CBondEqDlg::OnMenuFileSettings()
{
+ CAxisSettingsDlg axisDlg;
+ axisDlg.SetPLC(theApp.m_model.getBonder().getPLC("PLC(1)"));
+ axisDlg.DoModal();
+
+ /*
CSettingsDlg dlg;
dlg.DoModal();
+ */
}
void CBondEqDlg::OnUpdateMenuFileSettings(CCmdUI* pCmdUI)
@@ -537,14 +544,9 @@
ShowLoginDlg();
}
else if (2 == menuId) {
- if (userManager.isLoggedIn()) {
- userManager.logout();
- m_pTopToolbar->SetOperatorBtnText(_T("未登录"));
- }
-
- CAxisSettingsDlg axisDlg;
- axisDlg.SetPLC(theApp.m_model.getBonder().getPLC("PLC(1)"));
- axisDlg.DoModal();
+ // test
+ CUserManagerDlg dlg;
+ dlg.DoModal();
}
}
--
Gitblit v1.9.3