From da96e6da0b677c6a4e96308aaecd3d619a8e4db2 Mon Sep 17 00:00:00 2001 From: mrDarker <mr.darker@163.com> Date: 星期四, 26 六月 2025 08:46:11 +0800 Subject: [PATCH] Merge branch 'clh' into liuyang --- SourceCode/Bond/Servo/PortConfigurationDlg.h | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/SourceCode/Bond/Servo/PortConfigurationDlg.h b/SourceCode/Bond/Servo/PortConfigurationDlg.h index a016273..f08af7f 100644 --- a/SourceCode/Bond/Servo/PortConfigurationDlg.h +++ b/SourceCode/Bond/Servo/PortConfigurationDlg.h @@ -1,6 +1,7 @@ 锘�#pragma once #include "afxdialogex.h" #include "GridCtrl.h" +#include "CLoadPort.h" // CPortConfigurationDlg 瀵硅瘽妗� @@ -20,8 +21,20 @@ protected: virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 鏀寔 virtual BOOL OnInitDialog(); + afx_msg void OnSelchangeComboPort(); + afx_msg void OnBnClickedButtonApply(); DECLARE_MESSAGE_MAP() private: + int GetLoadPortEqID(const std::string& strPortName); + void LoadPortConfigToUI(SERVO::CLoadPort* pPort); + void InitGrid(); + void FillGrid(); + + SERVO::CLoadPort* m_pPort[4]; + CGridCtrl m_wndGrid; + CComboBox m_comboPort; + CComboBox m_comboRecipe; + CComboBox m_comboMaterialsType; }; -- Gitblit v1.9.3