From 1095cb22a8fe1c9ed840fc2a3852ba518589b077 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 20 九月 2025 14:37:50 +0800
Subject: [PATCH] 1.刷新,优化,增加工具条按钮;

---
 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