From 5a66d26a2899a2450a50f00d09c728ae151715be Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 23 七月 2025 11:19:42 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/PortConfigurationDlg.h | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/PortConfigurationDlg.h b/SourceCode/Bond/Servo/PortConfigurationDlg.h
index e735153..0475d2d 100644
--- a/SourceCode/Bond/Servo/PortConfigurationDlg.h
+++ b/SourceCode/Bond/Servo/PortConfigurationDlg.h
@@ -2,6 +2,8 @@
#include "afxdialogex.h"
#include "GridCtrl.h"
#include "CLoadPort.h"
+#include "CCustomCheckBox.h"
+
// CPortConfigurationDlg 瀵硅瘽妗�
@@ -13,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 };
@@ -23,18 +29,28 @@
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(SERVO::CSlot* pSlot, SERVO::CGlass* pGlass);
+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