~chenluhua/Bond2.git

Binary files differ

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

			@@ -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()


			@@ -121,3 +125,20 @@
			pItem->MoveWindow(x, y, rcClient.Width() - x - 12, rcClient.Height() - y - 12);
			*/
			}

			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();
			}

			@@ -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();
			};

Binary files differ

	SourceCode/Bond/BondEq/BondEq.rc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SourceCode/Bond/BondEq/BondEqDlg.cpp	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SourceCode/Bond/BondEq/CComponentPLCDlg.cpp	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SourceCode/Bond/BondEq/CComponentPLCDlg.h	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SourceCode/Bond/BondEq/Resource.h	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SourceCode/Bond/x64/Debug/Config/BondEq.db	补丁 \| 查看 \| 原始文档 \| blame \| 历史