From 62a4a8db6c05c98f180ae7f6429a9a232fce6c0c Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 03 七月 2025 17:19:16 +0800
Subject: [PATCH] 1. 重构机器人动画逻辑，采用分帧动画机制，避免在 OnTimer 中阻塞主线程； 2. 动画过程中允许动态中断，确保设备状态变化时可即时响应； 3. 动画结束时自动校正位置与角度，确保最终状态准确一致；
---
SourceCode/Bond/Servo/CEqAlarmStep.cpp | 74 ++++---------------------------------
1 files changed, 8 insertions(+), 66 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqAlarmStep.cpp b/SourceCode/Bond/Servo/CEqAlarmStep.cpp
index 67247eb..f488927 100644
--- a/SourceCode/Bond/Servo/CEqAlarmStep.cpp
+++ b/SourceCode/Bond/Servo/CEqAlarmStep.cpp
@@ -24,20 +24,21 @@
{
CReadStep::getAttributeVector(attrubutes);
+ unsigned int weight = 31;
attrubutes.addAttribute(new CAttribute("Alarm State",
- std::to_string(m_nAlarmState).c_str(), ""));
+ std::to_string(m_nAlarmState).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Unit ID",
- std::to_string(m_nUnitId).c_str(), ""));
+ std::to_string(m_nUnitId).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Alarm Level",
- std::to_string(m_nAlarmLevel).c_str(), ""));
+ std::to_string(m_nAlarmLevel).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Alarm Code",
- std::to_string(m_nAlarmCode).c_str(), ""));
+ std::to_string(m_nAlarmCode).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Alarm ID",
- std::to_string(m_nAlarmId).c_str(), ""));
+ std::to_string(m_nAlarmId).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Text",
- m_strText.c_str(), ""));
+ m_strText.c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Description",
- m_strDescription.c_str(), ""));
+ m_strDescription.c_str(), "", weight++));
}
int CEqAlarmStep::onReadData()
@@ -80,67 +81,8 @@
return 0;
}
- // 获取和设置 AlarmDev
- int CEqAlarmStep::getAlarmDev() const {
- return m_nAlarmDev;
- }
-
void CEqAlarmStep::setAlarmDev(int nAlarmDev) {
m_nAlarmDev = nAlarmDev;
- }
-
- // 获取和设置 AlarmState
- int CEqAlarmStep::getAlarmState() const {
- return m_nAlarmState;
- }
-
- void CEqAlarmStep::setAlarmState(int nAlarmState) {
- m_nAlarmState = nAlarmState;
- }
-
- // 获取和设置 UnitId
- int CEqAlarmStep::getUnitId() const {
- return m_nUnitId;
- }
-
- void CEqAlarmStep::setUnitId(int nUnitId) {
- m_nUnitId = nUnitId;
- }
-
- // 获取和设置 AlarmLevel
- int CEqAlarmStep::getAlarmLevel() const {
- return m_nAlarmLevel;
- }
-
- void CEqAlarmStep::setAlarmLevel(int nAlarmLevel) {
- m_nAlarmLevel = nAlarmLevel;
- }
-
- // 获取和设置 AlarmCode
- int CEqAlarmStep::getAlarmCode() const {
- return m_nAlarmCode;
- }
-
- void CEqAlarmStep::setAlarmCode(int nAlarmCode) {
- m_nAlarmCode = nAlarmCode;
- }
-
- // 获取和设置 AlarmId
- int CEqAlarmStep::getAlarmId() const {
- return m_nAlarmId;
- }
-
- void CEqAlarmStep::setAlarmId(int nAlarmId) {
- m_nAlarmId = nAlarmId;
- }
-
- // 获取和设置 Text
- std::string CEqAlarmStep::getText() const {
- return m_strText;
- }
-
- void CEqAlarmStep::setText(const std::string& strText) {
- m_strText = strText;
}
int CEqAlarmStep::getAlarmState()
--
Gitblit v1.9.3