From 7c35ff8d9a626f69a8a8b7de3d73dc9d73de9dd7 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期六, 13 九月 2025 10:51:32 +0800
Subject: [PATCH] 1. 解决读取报警文件错误的问题，提高兼容性（可能文件是在MacOS编辑的，导致换行符不一样）
---
SourceCode/Bond/Servo/CStep.cpp | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CStep.cpp b/SourceCode/Bond/Servo/CStep.cpp
index 4ac3dfd..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()
--
Gitblit v1.9.3