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/CEqAlarmStep.cpp | 99 +++++++++++++++++++------------------------------
1 files changed, 39 insertions(+), 60 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqAlarmStep.cpp b/SourceCode/Bond/Servo/CEqAlarmStep.cpp
index 0b42394..63adada 100644
--- a/SourceCode/Bond/Servo/CEqAlarmStep.cpp
+++ b/SourceCode/Bond/Servo/CEqAlarmStep.cpp
@@ -5,7 +5,7 @@
namespace SERVO {
- CEqAlarmStep::CEqAlarmStep() : CStep()
+ CEqAlarmStep::CEqAlarmStep() : CReadStep()
{
m_nAlarmDev = 0;
m_nAlarmState = 0;
@@ -19,9 +19,31 @@
{
}
+
+ void CEqAlarmStep::getAttributeVector(CAttributeVector& attrubutes)
+ {
+ CReadStep::getAttributeVector(attrubutes);
+
+ unsigned int weight = 31;
+ attrubutes.addAttribute(new CAttribute("Alarm State",
+ std::to_string(m_nAlarmState).c_str(), "", weight++));
+ attrubutes.addAttribute(new CAttribute("Unit ID",
+ std::to_string(m_nUnitId).c_str(), "", weight++));
+ attrubutes.addAttribute(new CAttribute("Alarm Level",
+ std::to_string(m_nAlarmLevel).c_str(), "", weight++));
+ attrubutes.addAttribute(new CAttribute("Alarm Code",
+ std::to_string(m_nAlarmCode).c_str(), "", weight++));
+ attrubutes.addAttribute(new CAttribute("Alarm ID",
+ std::to_string(m_nAlarmId).c_str(), "", weight++));
+ attrubutes.addAttribute(new CAttribute("Text",
+ m_strText.c_str(), "", weight++));
+ attrubutes.addAttribute(new CAttribute("Description",
+ m_strDescription.c_str(), "", weight++));
+ }
+
int CEqAlarmStep::onReadData()
{
- CStep::onReadData();
+ CReadStep::onReadData();
char szBuffer[64];
int nRet = m_pCclink->ReadData2(m_station, DeviceType::W,
@@ -36,7 +58,7 @@
m_nAlarmCode = (unsigned int)CToolUnits::toInt16(&szBuffer[6]);
m_nAlarmLevel = (unsigned int)CToolUnits::toInt16(&szBuffer[8]);
- LOGI("<CEqAlarmStep> Equipment Alarm state Changed<State:%d, Unit:%d, Level:%d, Code:%d, ID:%d>\n",
+ LOGE("<CEqAlarmStep> Equipment Alarm state Changed<State:%d, Unit:%d, Level:%d, Code:%d, ID:%d>",
m_nAlarmState, m_nUnitId, m_nAlarmLevel, m_nAlarmCode, m_nAlarmId,
m_strText.c_str(), m_strDescription.c_str());
@@ -45,89 +67,46 @@
int CEqAlarmStep::onComplete()
{
- CStep::onComplete();
- LOGI("<CEqAlarmStep> onComplete.");
+ CReadStep::onComplete();
+ LOGD("<CEqAlarmStep> onComplete.");
return 0;
}
int CEqAlarmStep::onTimeout()
{
- CStep::onTimeout();
- LOGI("<CEqAlarmStep> onTimeout.");
+ CReadStep::onTimeout();
+ LOGE("<CEqAlarmStep> onTimeout.");
return 0;
- }
-
- // 获取和设置 AlarmDev
- int CEqAlarmStep::getAlarmDev() const {
- return m_nAlarmDev;
}
void CEqAlarmStep::setAlarmDev(int nAlarmDev) {
m_nAlarmDev = nAlarmDev;
}
- // 获取和设置 AlarmState
- int CEqAlarmStep::getAlarmState() const {
+ int CEqAlarmStep::getAlarmState()
+ {
return m_nAlarmState;
}
- void CEqAlarmStep::setAlarmState(int nAlarmState) {
- m_nAlarmState = nAlarmState;
- }
-
- // 获取和设置 UnitId
- int CEqAlarmStep::getUnitId() const {
+ int CEqAlarmStep::getUnitId()
+ {
return m_nUnitId;
}
- void CEqAlarmStep::setUnitId(int nUnitId) {
- m_nUnitId = nUnitId;
- }
-
- // 获取和设置 AlarmLevel
- int CEqAlarmStep::getAlarmLevel() const {
+ int CEqAlarmStep::getAlarmLevel()
+ {
return m_nAlarmLevel;
}
- void CEqAlarmStep::setAlarmLevel(int nAlarmLevel) {
- m_nAlarmLevel = nAlarmLevel;
- }
-
- // 获取和设置 AlarmCode
- int CEqAlarmStep::getAlarmCode() const {
+ int CEqAlarmStep::getAlarmCode()
+ {
return m_nAlarmCode;
}
- void CEqAlarmStep::setAlarmCode(int nAlarmCode) {
- m_nAlarmCode = nAlarmCode;
- }
-
- // 获取和设置 AlarmId
- int CEqAlarmStep::getAlarmId() const {
+ int CEqAlarmStep::getAlarmId()
+ {
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;
- }
-
- // 获取和设置 Description
- std::string CEqAlarmStep::getDescription() const {
- return m_strDescription;
- }
-
- void CEqAlarmStep::setDescription(const std::string& strDescription) {
- m_strDescription = strDescription;
}
}
--
Gitblit v1.9.3