1.合并

LAPTOP-SNT8I5JK\Boounion

2024-12-02 d9e65f3f10d4be89b3deb65ca3e16ce557fb875d

 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);


   // 菜单
@@ -496,9 +482,19 @@

void CBondEqDlg::OnMenuFileSettings()
{
   /*
   CAxisSettingsDlg axisDlg;
   axisDlg.SetPLC(theApp.m_model.getBonder().getPLC("PLC(1)"));
   axisDlg.SetRecipeName(_T("Default"));
   axisDlg.DoModal();
   */

   // Cavity VacuumBake AfterBake AOI
   CIOMonitoringDlg dlg;
   dlg.SetIOManager("Cavity");
   dlg.SetPLC(theApp.m_model.getBonder().getPLC("PLC(1)"));
   dlg.DoModal();


   /*
   CSettingsDlg dlg;