Merge branch 'clh' into liuyang

LAPTOP-T815PCOQ\25526

2024-12-10 47718a637fa239dcbec0fffca736f3c3b1cf7887

 SourceCode/Bond/BondEq/BondEqDlg.cpp

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

// test
#include "AxisSettingsDlg.h"
#include "IOMonitoringDlg.h"

#ifdef _DEBUG
#define new DEBUG_NEW
@@ -508,23 +505,8 @@

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;
   dlg.DoModal();
   */
}

void CBondEqDlg::OnUpdateMenuFileSettings(CCmdUI* pCmdUI)
@@ -591,6 +573,7 @@
         return 0;
      }

      /*
      CString inputText = inputDialog.GetInputText();
      std::string strPass = UserManager::getInstance().getCurrentPass();
      if (inputText.Compare(strPass.c_str()) != 0) {
@@ -598,14 +581,17 @@
         logManager.log(SystemLogManager::LogType::Info, _T("验证时，密码错误！"));
         return 0;
      }
      */
   }

   if (id == IDC_BUTTON_RUN) {
      theApp.m_model.getBonder().start();
      m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(FALSE);
      m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(TRUE);
      logManager.log(SystemLogManager::LogType::Operation, _T("运行..."));
   }
   else if (id == IDC_BUTTON_STOP) {
      theApp.m_model.getBonder().stop();
      m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(TRUE);
      m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
      logManager.log(SystemLogManager::LogType::Operation, _T("ֹͣ..."));
@@ -778,8 +764,9 @@
CComponentPLCDlg* CBondEqDlg::CreateComponentPLCDlg(CComponent* pComponent)
{
   CComponentPLCDlg* pDlg = new CComponentPLCDlg(m_pMainContainer);
   pDlg->Create(IDD_COMPONENT_PLC, m_pMainContainer);
   pDlg->SetContext(pComponent);
   pDlg->Create(IDD_COMPONENT_PLC, m_pMainContainer);


   CString strIcon0, strIcon1, strIcon2, strIcon3;
   strIcon0.Format(_T("%s\\Res\\small_close0.ico"), (LPTSTR)(LPCTSTR)theApp.m_strAppDir);