From 66786f85648c3c81b932decba339ffb359a7bf25 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期一, 25 十一月 2024 17:46:56 +0800
Subject: [PATCH] 1.完成初版轴管理类 2.实现基本的轴设定界面的交互
---
SourceCode/Bond/BondEq/BondEqDlg.cpp | 59 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 10 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEqDlg.cpp b/SourceCode/Bond/BondEq/BondEqDlg.cpp
index 9668aa4..0fb1060 100644
--- a/SourceCode/Bond/BondEq/BondEqDlg.cpp
+++ b/SourceCode/Bond/BondEq/BondEqDlg.cpp
@@ -9,13 +9,13 @@
#include "Common.h"
#include "CBonder.h"
#include "SettingsDlg.h"
+#include "InputDialog.h"
#include "LoginDlg.h"
#include "ChangePasswordDlg.h"
-#include "InputDialog.h"
#include "UserManagerDlg.h"
-
-// test
#include "SystemLogManagerDlg.h"
+#include "AxisSettingsDlg.h"
+
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -186,11 +186,42 @@
// 设置运行日志模块的数据库连接
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;
+ }
+
+ // 设置轴设定模块的数据库连接
+ AxisManager& axisManager = AxisManager::getInstance();
+ axisManager.setDatabase(db.get());
+
+ // 初始化轴设定表
+ try {
+ if (!axisManager.initializeTables()) {
+ AfxMessageBox("创建轴设定表失败！");
+ return FALSE;
+ }
+
+ if (!axisManager.initializeDefaultData()) {
+ AfxMessageBox("初始化轴设定默认数据失败！");
+ return FALSE;
+ }
+ }
+ catch (const std::exception& ex) {
+ CString errorMsg;
+ errorMsg.Format(_T("初始化轴设定模块失败：%s"), CString(ex.what()));
+ AfxMessageBox(errorMsg, MB_ICONERROR);
return FALSE;
}
@@ -465,8 +496,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)
@@ -564,10 +601,6 @@
loginDlg.DoModal();
}
else if (1 == menuId) {
- // test
- CSystemLogManagerDlg dlg;
- dlg.DoModal();
-
CChangePasswordDlg changePasswordDlg;
changePasswordDlg.DoModal();
}
@@ -578,6 +611,10 @@
}
}
else if (3 == menuId) {
+ CSystemLogManagerDlg dlg;
+ dlg.DoModal();
+ }
+ else if (4 == menuId) {
int ret = AfxMessageBox(_T("是否切换用户？切换用户会退出当前账号！"), MB_OKCANCEL | MB_ICONEXCLAMATION);
if (ret != IDOK) {
return 0;
@@ -684,6 +721,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);
@@ -700,6 +738,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