From aedb3b85fed48cb2cf0abb5fafa8e7591644c9f4 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 02 十二月 2024 08:53:06 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh
---
SourceCode/Bond/BondEq/BondEqDlg.cpp | 42 +++++++++++++++++++-----------------------
1 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEqDlg.cpp b/SourceCode/Bond/BondEq/BondEqDlg.cpp
index 0fb1060..7b3a65b 100644
--- a/SourceCode/Bond/BondEq/BondEqDlg.cpp
+++ b/SourceCode/Bond/BondEq/BondEqDlg.cpp
@@ -8,14 +8,17 @@
#include "afxdialogex.h"
#include "Common.h"
#include "CBonder.h"
+#include "ToolUnits.h"
#include "SettingsDlg.h"
#include "InputDialog.h"
#include "LoginDlg.h"
#include "ChangePasswordDlg.h"
#include "UserManagerDlg.h"
#include "SystemLogManagerDlg.h"
-#include "AxisSettingsDlg.h"
+// test
+#include "AxisSettingsDlg.h"
+#include "IOMonitoringDlg.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -202,28 +205,11 @@
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;
- }
+ // 设置配方文件夹路径
+ RecipeManager& recipeManager = RecipeManager::getInstance();
+ std::string strRecipePath = CToolUnits::getCurrentExePath() + _T("\\Recipe");
+ CToolUnits::createDir(strRecipePath.c_str());
+ recipeManager.setRecipeFolder(strRecipePath);
// 菜单
@@ -499,6 +485,16 @@
CAxisSettingsDlg axisDlg;
axisDlg.SetPLC(theApp.m_model.getBonder().getPLC("PLC(1)"));
axisDlg.DoModal();
+ // Cavity VacuumBake AfterBake AOI
+ CIOMonitoringDlg dlg;
+ dlg.SetIOManager("Cavity");
+ dlg.SetPLC(theApp.m_model.getBonder().getPLC("PLC(1)"));
+ dlg.DoModal();
+
+ //CAxisSettingsDlg dlg;
+ //dlg.SetPLC(theApp.m_model.getBonder().getPLC("PLC(1)"));
+ //dlg.SetRecipeName(_T("Default"));
+ //dlg.DoModal();
/*
CSettingsDlg dlg;
--
Gitblit v1.9.3