From bc7f1c4e028e69be51079b59dae4ae5c4d43f5bb Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期六, 31 一月 2026 21:54:56 +0800
Subject: [PATCH] 1.状态指示图，目前灰色表示掉线，绿色表示在线。增加Slot的小点表示有没有料，及加工状态 。 2.增加图示
---
SourceCode/Bond/Servo/CStep.cpp | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CStep.cpp b/SourceCode/Bond/Servo/CStep.cpp
index d1907c7..cf7dff5 100644
--- a/SourceCode/Bond/Servo/CStep.cpp
+++ b/SourceCode/Bond/Servo/CStep.cpp
@@ -59,8 +59,17 @@
std::to_string(m_station.nNetNo).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Station",
std::to_string(m_station.nStNo).c_str(), "", weight++));
- attrubutes.addAttributeVector(m_attributeVector);
+ auto as = m_attributeVector.getAttributes();
+ for (auto item : as) {
+ attrubutes.addAttribute(new CAttribute(item->getName().c_str(),
+ item->getValue().c_str(), item->getDescription().c_str(), item->getWeight()));
+ }
+ }
+
+ CAttributeVector& CStep::attributeVector()
+ {
+ return m_attributeVector;
}
void CStep::init()
@@ -94,9 +103,16 @@
void CStep::addAttributeVector(CAttributeVector& attributeVector)
{
// 添加attribute时，要前删除存在的同名的attribute
- unsigned int size = attributeVector.size();
- for (unsigned int i = 0; i < size; i++) {
- m_attributeVector.addAttribute(attributeVector.getAttribute(i), TRUE);
+ 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;
+ }
}
}
--
Gitblit v1.9.3