From aedb3b85fed48cb2cf0abb5fafa8e7591644c9f4 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 02 十二月 2024 08:53:06 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh
---
SourceCode/Bond/BondEq/BondEqDlg.cpp | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEqDlg.cpp b/SourceCode/Bond/BondEq/BondEqDlg.cpp
index 3ae9e32..7b3a65b 100644
--- a/SourceCode/Bond/BondEq/BondEqDlg.cpp
+++ b/SourceCode/Bond/BondEq/BondEqDlg.cpp
@@ -15,8 +15,10 @@
#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
@@ -482,8 +484,17 @@
{
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();
+
+ //CAxisSettingsDlg dlg;
+ //dlg.SetPLC(theApp.m_model.getBonder().getPLC("PLC(1)"));
+ //dlg.SetRecipeName(_T("Default"));
+ //dlg.DoModal();
/*
CSettingsDlg dlg;
--
Gitblit v1.9.3