From b31770cfb61272f0bcf148198d1b95ef445fe079 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 21 八月 2025 10:56:53 +0800
Subject: [PATCH] 1.完善可折叠ListCtrl; 2.l加载Job时，根据ProcessID设置ControlJob的PJ列表 3.ControlJob对话框完善；
---
SourceCode/Bond/Servo/CMaster.cpp | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index 77b3a37..1f38e9f 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -1929,6 +1929,11 @@
return 0;
}
+ CControlJob* CMaster::getControlJob()
+ {
+ return m_pControlJob;
+ }
+
CLoadPort* CMaster::getPortWithCarrierId(const std::string& carrierId) const
{
CLoadPort* pPort;
@@ -2047,6 +2052,19 @@
m_processJobs.push_back(pProcessJob);
}
+
+ // 找到CProcessJob指针加入列表中
+ std::vector<CProcessJob*> tempPjs;
+ auto ids = m_pControlJob->pjIds();
+ for (auto id : ids) {
+ auto pj = getProcessJob(id);
+ if (pj != nullptr) {
+ tempPjs.push_back(pj);
+ }
+ }
+ m_pControlJob->setPJs(tempPjs);
+
+
// 如果版本升级，可在这里判断 version 来加载新字段
--
Gitblit v1.9.3