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 |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/BondEq/BondEqDlg.cpp b/SourceCode/Bond/BondEq/BondEqDlg.cpp
index c9a019f..3ae9e32 100644
--- a/SourceCode/Bond/BondEq/BondEqDlg.cpp
+++ b/SourceCode/Bond/BondEq/BondEqDlg.cpp
@@ -8,6 +8,7 @@
 #include "afxdialogex.h"
 #include "Common.h"
 #include "CBonder.h"
+#include "ToolUnits.h"
 #include "SettingsDlg.h"
 #include "InputDialog.h"
 #include "LoginDlg.h"
@@ -191,16 +192,22 @@
 	// 初始化运行日志表
 	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;
 	}
+
+	// 设置配方文件夹路径
+	RecipeManager& recipeManager = RecipeManager::getInstance();
+	std::string strRecipePath =  CToolUnits::getCurrentExePath() + _T("\\Recipe");
+	CToolUnits::createDir(strRecipePath.c_str());
+	recipeManager.setRecipeFolder(strRecipePath);
 
 
 	// 菜单
@@ -475,6 +482,7 @@
 {
 	CAxisSettingsDlg axisDlg;
 	axisDlg.SetPLC(theApp.m_model.getBonder().getPLC("PLC(1)"));
+	axisDlg.SetRecipeName(_T("Default"));
 	axisDlg.DoModal();
 
 	/*

--
Gitblit v1.9.3