From 0de0a72329a77fbf20bc299c542e435a6d47256b Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 21 六月 2025 17:12:01 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh
---
SourceCode/Bond/Servo/CStep.cpp | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CStep.cpp b/SourceCode/Bond/Servo/CStep.cpp
index e600414..4ac3dfd 100644
--- a/SourceCode/Bond/Servo/CStep.cpp
+++ b/SourceCode/Bond/Servo/CStep.cpp
@@ -53,11 +53,14 @@
void CStep::getAttributeVector(CAttributeVector& attrubutes)
{
+ unsigned int weight = 1;
attrubutes.clear();
attrubutes.addAttribute(new CAttribute("Network",
- std::to_string(m_station.nNetNo).c_str(), ""));
+ std::to_string(m_station.nNetNo).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Station",
- std::to_string(m_station.nStNo).c_str(), ""));
+ std::to_string(m_station.nStNo).c_str(), "", weight++));
+ attrubutes.addAttributeVector(m_attributeVector);
+
}
void CStep::init()
@@ -82,6 +85,28 @@
return iter->second;
}
+ void CStep::addAttribute(CAttribute* pAttribute)
+ {
+ // 添加attribute时，要前删除存在的同名的attribute
+ m_attributeVector.addAttribute(pAttribute, TRUE);
+ }
+
+ void CStep::addAttributeVector(CAttributeVector& attributeVector)
+ {
+ // 添加attribute时，要前删除存在的同名的attribute
+ std::vector<CAttribute*>& srcs = attributeVector.getAttributes();
+ auto it = srcs.begin();
+ while (it != srcs.end()) {
+ BOOL bAdd = m_attributeVector.addAttribute((*it), TRUE);
+ if (bAdd) {
+ it = srcs.erase(it);
+ }
+ else {
+ ++it;
+ }
+ }
+ }
+
void CStep::convertString(const char* pszBuffer, int size, std::string& strOut)
{
strOut.clear();
--
Gitblit v1.9.3