From b2aa706dfea78ad2e327fb5e414207af69d23d64 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 13 九月 2025 11:33:04 +0800
Subject: [PATCH] 1.对话框显示工艺参数,可复制到剪贴板; 2.修复几处因按回车或ESC键导致页面被关闭的问题; 3.修复解释警告数据文本失败的问题; 4.更新警告文本,显示警告详细信息; 5.完善警告描述内容 ;
---
SourceCode/Bond/BondEq/CProjectPageComponents.cpp | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/SourceCode/Bond/BondEq/CProjectPageComponents.cpp b/SourceCode/Bond/BondEq/CProjectPageComponents.cpp
index 3afe5e9..e6eb9f5 100644
--- a/SourceCode/Bond/BondEq/CProjectPageComponents.cpp
+++ b/SourceCode/Bond/BondEq/CProjectPageComponents.cpp
@@ -6,6 +6,7 @@
#include "CProjectPageComponents.h"
#include "afxdialogex.h"
#include "Alarm.h"
+#include "AlarmMonitor.h"
// CProjectPageComponents 瀵硅瘽妗�
@@ -72,18 +73,16 @@
}
}
}
- else if (RX_CODE_ALARM_EVENT == code) {
- CComponent* pComponent = nullptr;
- CAlarm* pAlarm = nullptr;
- pAny->getObject("obj", (IRxObject*&)pAlarm);
+ else if (RX_CODE_ALARM_ON == code
+ || RX_CODE_ALARM_OFF == code) {
+ CAlarmMonitor* pComponent = nullptr;
pAny->getPtrValue("ptr", (void*&)pComponent);
ASSERT(pComponent);
- ASSERT(pAlarm);
HTREEITEM hItem = getTreeItem(pComponent);
if (hItem != nullptr) {
- if(pAlarm->getStatus() == 1)
+ if (pComponent->isAlarming())
m_treeComponents.ShowItemBadgeDotMode(hItem);
- else if (pAlarm->getStatus() == 2)
+ else
m_treeComponents.HideItemBadge(hItem);
}
}
--
Gitblit v1.9.3