From 4ef35bf238fc6f7217e4b6de4aee37192ec503ec Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 17 九月 2025 13:36:27 +0800
Subject: [PATCH] 1.自绘CListCtrl用于ProcessJob的Carrier选择
---
SourceCode/Bond/Servo/ProcessJob.cpp | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/Servo/ProcessJob.cpp b/SourceCode/Bond/Servo/ProcessJob.cpp
index b672e27..1ae4b9e 100644
--- a/SourceCode/Bond/Servo/ProcessJob.cpp
+++ b/SourceCode/Bond/Servo/ProcessJob.cpp
@@ -7,9 +7,12 @@
namespace SERVO {
static inline std::string trimCopy(std::string s) {
- auto notspace = [](int ch) { return !std::isspace(ch); };
- s.erase(s.begin(), std::find_if(s.begin(), s.end(), notspace));
- s.erase(std::find_if(s.rbegin(), s.rend(), notspace).base(), s.end());
+ s.erase(s.begin(),
+ std::find_if(s.begin(), s.end(),
+ [](char c) { return !std::isspace(static_cast<unsigned char>(c)); }));
+ s.erase(std::find_if(s.rbegin(), s.rend(),
+ [](char c) { return !std::isspace(static_cast<unsigned char>(c)); }).base(),
+ s.end());
return s;
}
@@ -21,6 +24,12 @@
CProcessJob::CProcessJob(std::string pjId)
: m_pjId(trimCopy(pjId))
{
+ clampString(m_pjId, MAX_ID_LEN);
+ }
+
+ void CProcessJob::setId(std::string& id)
+ {
+ m_pjId = trimCopy(id);
clampString(m_pjId, MAX_ID_LEN);
}
@@ -61,7 +70,7 @@
m_pauseEvents.erase(std::unique(m_pauseEvents.begin(), m_pauseEvents.end()), m_pauseEvents.end());
}
- const std::vector<CProcessJob::ValidationIssue>& CProcessJob::issues()
+ const std::vector<CProcessJob::ValidationIssue>& CProcessJob::issues() const
{
return m_issues;
}
@@ -278,7 +287,7 @@
// 配方
uint8_t recipeType = static_cast<uint8_t>(m_recipeMethod);
- write_pod(os, m_recipeMethod);
+ write_pod(os, recipeType);
write_string(os, m_recipeSpec);
// 物料（多 Carrier & Slot）
@@ -399,13 +408,13 @@
return "InProcess";
break;
case SERVO::PJState::Paused:
- return "Queued";
+ return "Paused";
break;
case SERVO::PJState::Aborting:
return "Aborting";
break;
case SERVO::PJState::Completed:
- return "Queued";
+ return "Completed";
break;
case SERVO::PJState::Aborted:
return "Aborted";
@@ -420,7 +429,7 @@
return "";
}
- CarrierSlotInfo* CProcessJob::getCarrier(std::string& strId)
+ CarrierSlotInfo* CProcessJob::getCarrier(const std::string& strId)
{
for (auto& item : m_carriers) {
if (item.carrierId.compare(strId) == 0) {
--
Gitblit v1.9.3