From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/PortConfigurationDlg.h | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/PortConfigurationDlg.h b/SourceCode/Bond/Servo/PortConfigurationDlg.h
index dc33c95..0475d2d 100644
--- a/SourceCode/Bond/Servo/PortConfigurationDlg.h
+++ b/SourceCode/Bond/Servo/PortConfigurationDlg.h
@@ -1,6 +1,9 @@
锘�#pragma once
#include "afxdialogex.h"
#include "GridCtrl.h"
+#include "CLoadPort.h"
+#include "CCustomCheckBox.h"
+
// CPortConfigurationDlg 瀵硅瘽妗�
@@ -12,6 +15,10 @@
CPortConfigurationDlg(CWnd* pParent = nullptr); // 鏍囧噯鏋勯�犲嚱鏁�
virtual ~CPortConfigurationDlg();
+public:
+ void setCurSelPort(int sel);
+ BOOL IsCheckedAll();
+
// 瀵硅瘽妗嗘暟鎹�
#ifdef AFX_DESIGN_TIME
enum { IDD = IDD_DIALOG_PORT_CONFIGURATION };
@@ -20,16 +27,30 @@
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 鏀寔
virtual BOOL OnInitDialog();
+ afx_msg void OnSelchangeComboPort();
afx_msg void OnBnClickedButtonApply();
+ afx_msg LRESULT OnCheckAllClicked(WPARAM wParam, LPARAM lParam);
DECLARE_MESSAGE_MAP()
private:
int GetLoadPortEqID(const std::string& strPortName);
+ void LoadPortConfigToUI(SERVO::CLoadPort* pPort);
void InitGrid();
- void FillGrid();
+
+private:
+ SERVO::CLoadPort* m_pPort[4];
+ int m_nCurSelPort;
CGridCtrl m_wndGrid;
CComboBox m_comboPort;
CComboBox m_comboRecipe;
CComboBox m_comboMaterialsType;
+
+ CCustomCheckBox* m_pCheckBox;
+ BOOL m_bCheckedAll;
+
+public:
+ afx_msg void OnDestroy();
+ afx_msg void OnBnClickedButtonProcessStart();
+ afx_msg void OnBnClickedButtonProcessCancel();
};
--
Gitblit v1.9.3