From c6edbd1df725b75f0b1ed97ca178ea4e3231b25f Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期一, 09 十二月 2024 14:18:11 +0800
Subject: [PATCH] 1. axis设定先写入PLC,间隔2秒后更新界面和配方 2. IO模块如果是可以点击的信号,移动到控件上鼠标显示点击图标 3. io模块添加圆角功能

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