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.cpp | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/Servo/CCjPage2.cpp b/SourceCode/Bond/Servo/CCjPage2.cpp
index 3e973a3..e827a19 100644
--- a/SourceCode/Bond/Servo/CCjPage2.cpp
+++ b/SourceCode/Bond/Servo/CCjPage2.cpp
@@ -47,9 +47,9 @@
UpdatePjData();
}
-void CCjPage2::SetExclusionNames(std::vector<std::string>& names)
+void CCjPage2::SetPjWarps(std::vector<PJWarp>& pjs)
{
- m_exclusionNames = names;
+ m_pjWarps = pjs;
}
BOOL CCjPage2::OnInitDialog()
@@ -108,16 +108,20 @@
{
//SERVO::CProcessJob*
if (m_pContext == nullptr) return;
- SERVO::CProcessJob* pProcessJob = (SERVO::CProcessJob*)m_pContext;
+ PJWarp* pPjWarp = (PJWarp*)m_pContext;
+ SERVO::CProcessJob* pProcessJob = (SERVO::CProcessJob*)pPjWarp->pj;
// 鏇存柊鍚嶇О
BOOL bOkName = TRUE;
char szBuffer[256];
GetDlgItemText(IDC_EDIT_PJ_ID, szBuffer, 256);
- for (auto item : m_exclusionNames) {
- if (item.compare(std::string(szBuffer)) == 0) {
- bOkName = FALSE;
- break;
+ for (auto item : m_pjWarps) {
+ if (item.pj != m_pContext) {
+ SERVO::CProcessJob* temp = (SERVO::CProcessJob*)item.pj;
+ if (temp->id().compare(std::string(szBuffer)) == 0) {
+ bOkName = FALSE;
+ break;
+ }
}
}
if (!bOkName) {
@@ -160,7 +164,8 @@
}
if (m_pContext) {
- SERVO::CProcessJob* pProcessJob = (SERVO::CProcessJob*)m_pContext;
+ PJWarp* pPjWarp = (PJWarp*)m_pContext;
+ SERVO::CProcessJob* pProcessJob = (SERVO::CProcessJob*)pPjWarp->pj;
SetDlgItemText(IDC_EDIT_PJ_ID, pProcessJob->id().c_str());
int idx = pComboBox->FindStringExact(-1, pProcessJob->recipeSpec().c_str());
if (idx != CB_ERR) pComboBox->SetCurSel(idx);
--
Gitblit v1.9.3