From f11be08369d2d360dd265382c6afbb3bc2edc107 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 06 十二月 2024 10:58:57 +0800
Subject: [PATCH] 1.合并
---
SourceCode/Bond/BondEq/BondEqDlg.cpp | 21 ++-------------------
1 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEqDlg.cpp b/SourceCode/Bond/BondEq/BondEqDlg.cpp
index 70bde1c..498f7af 100644
--- a/SourceCode/Bond/BondEq/BondEqDlg.cpp
+++ b/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)
@@ -778,8 +760,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);
--
Gitblit v1.9.3