From c928b27306747319c3692879ab30d2508ca00ffc Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期五, 14 十一月 2025 11:35:22 +0800
Subject: [PATCH] 1.修复Job完成后未转移导致不能进行下一job的问题；
---
SourceCode/Bond/Servo/CAttributeVector.cpp | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CAttributeVector.cpp b/SourceCode/Bond/Servo/CAttributeVector.cpp
index bb673f7..d7c52b7 100644
--- a/SourceCode/Bond/Servo/CAttributeVector.cpp
+++ b/SourceCode/Bond/Servo/CAttributeVector.cpp
@@ -1,5 +1,6 @@
#include "stdafx.h"
#include "CAttributeVector.h"
+#include <algorithm>
namespace SERVO {
@@ -10,17 +11,49 @@
CAttributeVector::~CAttributeVector()
{
-
+ for (auto item : m_attributes) {
+ delete item;
+ }
+ m_attributes.clear();
}
- void CAttributeVector::addAttribute(CAttribute* pAttribute)
+ BOOL CAttributeVector::addAttribute(CAttribute* pAttribute, BOOL bReplace/* = FALSE*/)
{
+ if (!pAttribute) {
+ return FALSE;
+ }
+
+ const std::string& name = pAttribute->getName();
+ if (name.empty()) {
+ return FALSE;
+ }
+
+ if (bReplace) {
+ for (auto it = m_attributes.begin(); it != m_attributes.end(); ) {
+ if (name.compare((*it)->getName()) == 0) {
+ delete (*it);
+ it = m_attributes.erase(it);
+ }
+ else {
+ ++it;
+ }
+ }
+ }
+
m_attributes.push_back(pAttribute);
+ return TRUE;
+ }
+
+ void CAttributeVector::addAttributeVector(CAttributeVector& av)
+ {
+ for (auto item : av.m_attributes) {
+ m_attributes.push_back(item);
+ }
}
unsigned int CAttributeVector::size()
{
- return m_attributes.size();
+ return (unsigned int)m_attributes.size();
}
void CAttributeVector::clear()
@@ -29,6 +62,13 @@
delete item;
}
m_attributes.clear();
+ }
+
+ void CAttributeVector::sortWithWeight()
+ {
+ std::sort(m_attributes.begin(), m_attributes.end(), [](CAttribute* pAttribute1, CAttribute* pAttribut2) {
+ return pAttribute1->getWeight() < pAttribut2->getWeight();
+ });
}
bool CAttributeVector::empty()
@@ -41,4 +81,9 @@
ASSERT(index < m_attributes.size());
return m_attributes[index];
}
+
+ std::vector<CAttribute*>& CAttributeVector::getAttributes()
+ {
+ return m_attributes;
+ }
}
--
Gitblit v1.9.3