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/CCjPage2.h |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/SourceCode/Bond/Servo/CCjPage2.h b/SourceCode/Bond/Servo/CCjPage2.h
index c68c377..e9561cd 100644
--- a/SourceCode/Bond/Servo/CCjPage2.h
+++ b/SourceCode/Bond/Servo/CCjPage2.h
@@ -4,6 +4,7 @@
 #include "CCarrierSlotGrid.h"
 
 
+
 // CPjPage1 瀵硅瘽妗�
 
 class CCjPage2 : public CCjPageBase
@@ -15,11 +16,11 @@
 	virtual ~CCjPage2();
 
 public:
-	void SetExclusionNames(std::vector<std::string>& names);
+	void SetPjWarps(std::vector<PJWarp>& pjs);
 
 protected:
 	void Resize();
-	virtual void OnApply();
+	virtual int OnApply();
 	virtual void OnSetContext(void* pContext);
 
 private:
@@ -27,7 +28,8 @@
 
 private:
 	CCarrierSlotGrid m_grid;
-	std::vector<std::string> m_exclusionNames;
+	std::vector<PJWarp> m_pjWarps;
+	int m_nSelRadioId;
 
 // 瀵硅瘽妗嗘暟鎹�
 #ifdef AFX_DESIGN_TIME
@@ -47,4 +49,10 @@
 	afx_msg void OnBnClickedRadio2();
 	afx_msg void OnBnClickedRadio3();
 	afx_msg void OnBnClickedRadio4();
+	afx_msg void OnGridSelChanged(NMHDR* pNMHDR, LRESULT* pResult);
+	afx_msg void OnGridMatChanged(NMHDR* pNMHDR, LRESULT* pResult);
+	afx_msg void OnBnClickedButtonPort1ProcessStart();
+	afx_msg void OnBnClickedButtonPort2ProcessStart();
+	afx_msg void OnBnClickedButtonPort3ProcessStart();
+	afx_msg void OnBnClickedButtonPort4ProcessStart();
 };

--
Gitblit v1.9.3