From c4a65f54c7876395a07e4a0914035d707fac7ee2 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 12 六月 2025 15:06:27 +0800
Subject: [PATCH] 1. 模仿Bander添加VacuumBake、BakeCooling和Measurement写入事件 2. 修复搬运交互的地址 3. 修复状态图VacuumBake、BakeCooling和Measurement信号显示的问题
---
SourceCode/Bond/Servo/CAttributeVector.cpp | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CAttributeVector.cpp b/SourceCode/Bond/Servo/CAttributeVector.cpp
index 6d9213a..733c629 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 {
@@ -16,14 +17,33 @@
m_attributes.clear();
}
- void CAttributeVector::addAttribute(CAttribute* pAttribute)
+ void CAttributeVector::addAttribute(CAttribute* pAttribute, BOOL bReplace/* = FALSE*/)
{
+ if (bReplace) {
+ for (auto it = m_attributes.begin(); it != m_attributes.end(); ) {
+ if ((*it)->getName().compare(pAttribute->getName()) == 0) {
+ delete (*it);
+ it = m_attributes.erase(it);
+ }
+ else {
+ ++it;
+ }
+ }
+ }
+
m_attributes.push_back(pAttribute);
+ }
+
+ 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()
@@ -34,6 +54,13 @@
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()
{
return m_attributes.empty();
--
Gitblit v1.9.3