From 5a927fe5cd015bf00bc992220c0d4f8b802ca044 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 03 十二月 2024 09:37:21 +0800
Subject: [PATCH] 1.PLC页增加两按钮，将原测试代码移到此处
---
SourceCode/Bond/BondEq/Resource.h | 0
SourceCode/Bond/BondEq/CComponentPLCDlg.h | 2 ++
SourceCode/Bond/BondEq/BondEq.rc | 0
SourceCode/Bond/BondEq/CComponentPLCDlg.cpp | 23 ++++++++++++++++++++++-
SourceCode/Bond/BondEq/BondEqDlg.cpp | 18 ------------------
SourceCode/Bond/x64/Debug/Config/BondEq.db | 0
6 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEq.rc b/SourceCode/Bond/BondEq/BondEq.rc
index 02dcd4b..9cc7434 100644
--- a/SourceCode/Bond/BondEq/BondEq.rc
+++ b/SourceCode/Bond/BondEq/BondEq.rc
Binary files differ
diff --git a/SourceCode/Bond/BondEq/BondEqDlg.cpp b/SourceCode/Bond/BondEq/BondEqDlg.cpp
index 70bde1c..3584094 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)
diff --git a/SourceCode/Bond/BondEq/CComponentPLCDlg.cpp b/SourceCode/Bond/BondEq/CComponentPLCDlg.cpp
index 6e68ab6..f56598b 100644
--- a/SourceCode/Bond/BondEq/CComponentPLCDlg.cpp
+++ b/SourceCode/Bond/BondEq/CComponentPLCDlg.cpp
@@ -8,6 +8,8 @@
#include "Log.h"
#include "ToolUnits.h"
#include "Common.h"
+#include "AxisSettingsDlg.h"
+#include "IOMonitoringDlg.h"
// CComponentData1Dlg 瀵硅瘽妗�
@@ -34,6 +36,8 @@
ON_WM_CTLCOLOR()
ON_WM_DESTROY()
ON_WM_SIZE()
+ ON_BN_CLICKED(IDC_BUTTON_PLC_AXIS_SETTINGS, &CComponentPLCDlg::OnBnClickedButtonAxisSetting)
+ ON_BN_CLICKED(IDC_BUTTON_PLC_IO, &CComponentPLCDlg::OnBnClickedButtonIO)
END_MESSAGE_MAP()
@@ -120,4 +124,21 @@
pItem = GetDlgItem(IDC_LIST_ALARM);
pItem->MoveWindow(x, y, rcClient.Width() - x - 12, rcClient.Height() - y - 12);
*/
-}
\ No newline at end of file
+}
+
+void CComponentPLCDlg::OnBnClickedButtonAxisSetting()
+{
+ CAxisSettingsDlg axisDlg;
+ axisDlg.SetPLC(theApp.m_model.getBonder().getPLC("PLC(1)"));
+ axisDlg.SetRecipeName(_T("Default"));
+ axisDlg.DoModal();
+}
+
+void CComponentPLCDlg::OnBnClickedButtonIO()
+{
+ CIOMonitoringDlg dlg;
+ dlg.SetIOManager("Cavity");
+ dlg.SetPLC(theApp.m_model.getBonder().getPLC("PLC(1)"));
+ dlg.DoModal();
+}
+
diff --git a/SourceCode/Bond/BondEq/CComponentPLCDlg.h b/SourceCode/Bond/BondEq/CComponentPLCDlg.h
index b39ac8e..51a79e4 100644
--- a/SourceCode/Bond/BondEq/CComponentPLCDlg.h
+++ b/SourceCode/Bond/BondEq/CComponentPLCDlg.h
@@ -34,4 +34,6 @@
afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
afx_msg void OnDestroy();
afx_msg void OnSize(UINT nType, int cx, int cy);
+ afx_msg void OnBnClickedButtonAxisSetting();
+ afx_msg void OnBnClickedButtonIO();
};
diff --git a/SourceCode/Bond/BondEq/Resource.h b/SourceCode/Bond/BondEq/Resource.h
index 77f1666..d27a070 100644
--- a/SourceCode/Bond/BondEq/Resource.h
+++ b/SourceCode/Bond/BondEq/Resource.h
Binary files differ
diff --git a/SourceCode/Bond/x64/Debug/Config/BondEq.db b/SourceCode/Bond/x64/Debug/Config/BondEq.db
index 71b57ba..82fb855 100644
--- a/SourceCode/Bond/x64/Debug/Config/BondEq.db
+++ b/SourceCode/Bond/x64/Debug/Config/BondEq.db
Binary files differ
--
Gitblit v1.9.3