From 6365b1d493ca23688fa1fb9a8fc51513dc6bb6d8 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期一, 25 十一月 2024 18:10:46 +0800
Subject: [PATCH] 1.完成上下切换轴 2.补全未追踪的文件
---
SourceCode/Bond/BondEq/BondEqDlg.cpp | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEqDlg.cpp b/SourceCode/Bond/BondEq/BondEqDlg.cpp
index 21722d8..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
@@ -191,13 +191,36 @@
// 初始化运行日志表
try {
if (!logManager.initializeLogTable()) {
- AfxMessageBox("初始化系统日志表失败！");
+ AfxMessageBox("初始化系统日志模块失败！");
return FALSE;
}
}
catch (const std::exception& ex) {
CString errorMsg;
- errorMsg.Format(_T("初始化系统日志表失败：%s"), CString(ex.what()));
+ 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;
}
@@ -473,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)
--
Gitblit v1.9.3