From 62bec5118f5e5fe750017cf2f12d4a428ab092df Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 17 九月 2025 18:06:30 +0800
Subject: [PATCH] 1.继续CControlJobManagerDlg的功能实现；
---
SourceCode/Bond/Servo/CCjPage2.h | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CCjPage2.h b/SourceCode/Bond/Servo/CCjPage2.h
index 5a7338b..bbbdb59 100644
--- a/SourceCode/Bond/Servo/CCjPage2.h
+++ b/SourceCode/Bond/Servo/CCjPage2.h
@@ -1,8 +1,15 @@
锘�#pragma once
#include "CCjPageBase.h"
#include "ProcessJob.h"
-#include "CCarrierSlotSelector.h"
+#include "CCarrierSlotGrid.h"
+
+
+struct PJWarp {
+ void* pj;
+ int port;
+ bool checkSlot[8];
+};
// CPjPage1 瀵硅瘽妗�
@@ -14,6 +21,9 @@
CCjPage2(CWnd* pParent = nullptr); // 鏍囧噯鏋勯�犲嚱鏁�
virtual ~CCjPage2();
+public:
+ void SetPjWarps(std::vector<PJWarp>& pjs);
+
protected:
void Resize();
virtual void OnApply();
@@ -23,7 +33,8 @@
void UpdatePjData();
private:
- CCarrierSlotSelector m_selector;
+ CCarrierSlotGrid m_grid;
+ std::vector<PJWarp> m_pjWarps;
// 瀵硅瘽妗嗘暟鎹�
#ifdef AFX_DESIGN_TIME
@@ -39,4 +50,8 @@
afx_msg void OnDestroy();
afx_msg void OnEnChangeEditPjId();
afx_msg void OnCbnSelchangeComboRecipe();
+ afx_msg void OnBnClickedRadio1();
+ afx_msg void OnBnClickedRadio2();
+ afx_msg void OnBnClickedRadio3();
+ afx_msg void OnBnClickedRadio4();
};
--
Gitblit v1.9.3