1.20250102合并；

LAPTOP-SNT8I5JK\Boounion

2025-01-02 d362ec98ec0db2039944da31729ad8efcd72834a

 SourceCode/Bond/BondEq/BondEqDlg.cpp

@@ -16,6 +16,8 @@
#include "UserManagerDlg.h"
#include "SystemLogManagerDlg.h"

// 测试
#include "RecipeListDlg.h"

#ifdef _DEBUG
#define new DEBUG_NEW
@@ -251,10 +253,12 @@

   // 设置配方文件夹路径
   RecipeManager& recipeManager = RecipeManager::getInstance();
   std::string strRecipePath =  CToolUnits::getCurrentExePath() + _T("\\Recipe");
   std::string strRecipePath =  CToolUnits::getRecipePath();
   CToolUnits::createDir(strRecipePath.c_str());
   recipeManager.setRecipeFolder(strRecipePath);

   if (!recipeManager.loadRecipe("Default")) {
      AfxMessageBox("Default 配方加载失败！");
   }

   // 菜单
   CMenu menu;
@@ -538,8 +542,11 @@

void CBondEqDlg::OnMenuFileSettings()
{
   CSettingsDlg dlg;
   CRecipeListDlg dlg;
   dlg.DoModal();

   //CSettingsDlg dlg;
   //dlg.DoModal();
}

void CBondEqDlg::OnUpdateMenuFileSettings(CCmdUI* pCmdUI)
@@ -825,6 +832,7 @@
{
   if (m_pAlarmWnd == nullptr) {
      m_pAlarmWnd = new CAlarmPopupDlg();
      m_pAlarmWnd->SetPLC(theApp.m_model.getBonder().getPLC("PLC(1)"));
      m_pAlarmWnd->Create(IDD_DIALOG_POPUP_ALARM, this);
      m_pAlarmWnd->CenterWindow();
   }
@@ -835,6 +843,7 @@
{
   if (m_pAlarmWnd == nullptr) {
      m_pAlarmWnd = new CAlarmPopupDlg();
      m_pAlarmWnd->SetPLC(theApp.m_model.getBonder().getPLC("PLC(1)"));
      m_pAlarmWnd->Create(IDD_DIALOG_POPUP_ALARM, this);
      m_pAlarmWnd->CenterWindow();
   }