From 2cd3e98d5d0bdf341d772b7e75869cd6f2b39280 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期三, 27 十一月 2024 09:40:09 +0800
Subject: [PATCH] 1. 监听按钮按下抬起事件
---
SourceCode/Bond/BondEq/BondEqDlg.cpp | 74 +++++++++++++++++++++++++-----------
1 files changed, 51 insertions(+), 23 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEqDlg.cpp b/SourceCode/Bond/BondEq/BondEqDlg.cpp
index 1a8a2ec..3ae9e32 100644
--- a/SourceCode/Bond/BondEq/BondEqDlg.cpp
+++ b/SourceCode/Bond/BondEq/BondEqDlg.cpp
@@ -8,13 +8,14 @@
#include "afxdialogex.h"
#include "Common.h"
#include "CBonder.h"
+#include "ToolUnits.h"
#include "SettingsDlg.h"
-#include "UserManager.h"
-#include "SystemLogManager.h"
+#include "InputDialog.h"
#include "LoginDlg.h"
#include "ChangePasswordDlg.h"
-#include "InputDialog.h"
#include "UserManagerDlg.h"
+#include "SystemLogManagerDlg.h"
+#include "AxisSettingsDlg.h"
#ifdef _DEBUG
@@ -184,21 +185,29 @@
userManager.loadSession();
std::unique_ptr<BL::Database>& db = userManager.getDatabaseInstance();
- // 设置日志模块的数据库连接
+ // 设置运行日志模块的数据库连接
SystemLogManager& logManager = SystemLogManager::getInstance();
- logManager.setDatabase(db);
+ logManager.setDatabase(db.get());
- // 初始化日志表
- if (!logManager.initializeLogTable()) {
- AfxMessageBox("初始化系统日志表失败！");
+ // 初始化运行日志表
+ try {
+ if (!logManager.initializeLogTable()) {
+ AfxMessageBox("初始化系统日志模块失败！");
+ return FALSE;
+ }
+ }
+ catch (const std::exception& ex) {
+ CString errorMsg;
+ errorMsg.Format(_T("初始化系统日志模块失败：%s"), CString(ex.what()));
+ AfxMessageBox(errorMsg, MB_ICONERROR);
return FALSE;
}
- std::string strUsername = userManager.getCurrentUser();
- if (strUsername.empty()) {
- strUsername = "SYSTEM";
- }
- logManager.log(SystemLogManager::LogType::Info, _T("BondEq启动..."), strUsername);
+ // 设置配方文件夹路径
+ RecipeManager& recipeManager = RecipeManager::getInstance();
+ std::string strRecipePath = CToolUnits::getCurrentExePath() + _T("\\Recipe");
+ CToolUnits::createDir(strRecipePath.c_str());
+ recipeManager.setRecipeFolder(strRecipePath);
// 菜单
@@ -243,6 +252,7 @@
// 更新登录状态
UpdateLoginStatus();
+ logManager.log(SystemLogManager::LogType::Info, _T("BondEq启动..."));
return TRUE; // 除非将焦点设置到控件，否则返回 TRUE
@@ -368,11 +378,7 @@
KillTimer(1);
#endif
- std::string strUsername = UserManager::getInstance().getCurrentUser();
- if (strUsername.empty()) {
- strUsername = "SYSTEM";
- }
- SystemLogManager::getInstance().log(SystemLogManager::LogType::Info, _T("BondEq关闭..."), strUsername);
+ SystemLogManager::getInstance().log(SystemLogManager::LogType::Info, _T("BondEq关闭..."));
}
void CBondEqDlg::OnSize(UINT nType, int cx, int cy)
@@ -474,8 +480,15 @@
void CBondEqDlg::OnMenuFileSettings()
{
+ CAxisSettingsDlg axisDlg;
+ axisDlg.SetPLC(theApp.m_model.getBonder().getPLC("PLC(1)"));
+ axisDlg.SetRecipeName(_T("Default"));
+ axisDlg.DoModal();
+
+ /*
CSettingsDlg dlg;
dlg.DoModal();
+ */
}
void CBondEqDlg::OnUpdateMenuFileSettings(CCmdUI* pCmdUI)
@@ -533,6 +546,7 @@
LRESULT CBondEqDlg::OnToolbarBtnClicked(WPARAM wParam, LPARAM lParam)
{
int id = (int)lParam;
+ SystemLogManager& logManager = SystemLogManager::getInstance();
if (id == IDC_BUTTON_RUN || id == IDC_BUTTON_STOP || id == IDC_BUTTON_SETTINGS)
{
CInputDialog inputDialog(_T("验证用户"), _T("请输入用户密码："));
@@ -545,6 +559,7 @@
std::string strPass = UserManager::getInstance().getCurrentPass();
if (inputText.Compare(strPass.c_str()) != 0) {
AfxMessageBox(_T("密码错误！"));
+ logManager.log(SystemLogManager::LogType::Info, _T("验证时，密码错误！"));
return 0;
}
}
@@ -552,10 +567,12 @@
if (id == IDC_BUTTON_RUN) {
m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(FALSE);
m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(TRUE);
+ logManager.log(SystemLogManager::LogType::Operation, _T("运行..."));
}
else if (id == IDC_BUTTON_STOP) {
m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(TRUE);
m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
+ logManager.log(SystemLogManager::LogType::Operation, _T("停止..."));
}
else if (id == IDC_BUTTON_SETTINGS) {
CSettingsDlg dlg;
@@ -574,15 +591,23 @@
}
else if (2 == menuId) {
CUserManagerDlg dlg;
- dlg.DoModal();
+ if (dlg.DoModal()!= IDOK) {
+ logManager.log(SystemLogManager::LogType::Operation, _T("用户管理的预操作被取消！"));
+ }
}
else if (3 == menuId) {
- int ret = AfxMessageBox(_T("是否切换用户？切换用户会退出当前账号！"), MB_OK | MB_ICONEXCLAMATION);
- if (ret != MB_OK) {
+ CSystemLogManagerDlg dlg;
+ dlg.DoModal();
+ }
+ else if (4 == menuId) {
+ int ret = AfxMessageBox(_T("是否切换用户？切换用户会退出当前账号！"), MB_OKCANCEL | MB_ICONEXCLAMATION);
+ if (ret != IDOK) {
return 0;
}
+ logManager.log(SystemLogManager::LogType::Operation, _T("确认切换角色！"));
if (userManager.isLoggedIn()) {
+ logManager.log(SystemLogManager::LogType::Info, _T("退出登录！"));
userManager.logout();
}
@@ -592,11 +617,12 @@
else {
CString cstrMessage;
cstrMessage.Format(_T("是否退出用户 [%s]？"), userManager.getCurrentUser().c_str());
- int ret = AfxMessageBox(_T(cstrMessage), MB_OK | MB_ICONEXCLAMATION);
- if (ret != MB_OK) {
+ int ret = AfxMessageBox(_T(cstrMessage), MB_OKCANCEL | MB_ICONEXCLAMATION);
+ if (ret != IDOK) {
return 0;
}
+ logManager.log(SystemLogManager::LogType::Info, _T("退出登录！"));
userManager.logout();
}
@@ -680,6 +706,7 @@
{
::EnableMenuItem(hMenu, ID_OPEATOR_LOGIN, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
::EnableMenuItem(hMenu, ID_OPERATOR_CHANGE_PASSWORD, MF_BYCOMMAND | MF_ENABLED);
+ ::EnableMenuItem(hMenu, ID_OPERATOR_SYSTEM_LOG, MF_BYCOMMAND | MF_ENABLED);
::EnableMenuItem(hMenu, ID_OPEATOR_SWITCH, MF_BYCOMMAND | MF_ENABLED);
::EnableMenuItem(hMenu, ID_OPERATOR_LOGOUT, MF_BYCOMMAND | MF_ENABLED);
@@ -696,6 +723,7 @@
::EnableMenuItem(hMenu, ID_OPEATOR_LOGIN, MF_BYCOMMAND | MF_ENABLED);
::EnableMenuItem(hMenu, ID_OPERATOR_CHANGE_PASSWORD, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
::EnableMenuItem(hMenu, ID_OPEATOR_USER_MANAGER, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+ ::EnableMenuItem(hMenu, ID_OPERATOR_SYSTEM_LOG, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
::EnableMenuItem(hMenu, ID_OPEATOR_SWITCH, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
::EnableMenuItem(hMenu, ID_OPERATOR_LOGOUT, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
--
Gitblit v1.9.3