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/Servo/PageTransferLog.cpp | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/SourceCode/Bond/Servo/PageTransferLog.cpp b/SourceCode/Bond/Servo/PageTransferLog.cpp
index 8000c23..9ec52d4 100644
--- a/SourceCode/Bond/Servo/PageTransferLog.cpp
+++ b/SourceCode/Bond/Servo/PageTransferLog.cpp
@@ -51,7 +51,7 @@
CDialogEx::DoDataExchange(pDX);
}
-void CPageTransferLog::InitRxWindow()
+void CPageTransferLog::InitRxWindows()
{
/* code */
// 璁㈤槄鏁版嵁
@@ -63,12 +63,9 @@
pAny->addRef();
int code = pAny->getCode();
- //if (RX_CODE_ALARM_SET == code) {
- // UpdatePageData();
- //}
- //else if (RX_CODE_ALARM_CLEAR == code) {
- // UpdatePageData();
- //}
+ if (RX_CODE_EQ_ROBOT_TASK == code) {
+ UpdatePageData();
+ }
pAny->release();
}, [&]() -> void {
@@ -278,7 +275,12 @@
return;
}
- int nItem = m_listCtrl.InsertItem(0, _T(""));
+ int nIndex = m_listCtrl.GetItemCount();
+ if (nIndex < 0) {
+ return;
+ }
+
+ int nItem = m_listCtrl.InsertItem(nIndex, _T(""));
CString str;
str.Format(_T("%d"), data.nRecordId);
m_listCtrl.SetItemText(nItem, 1, str);
@@ -406,7 +408,7 @@
{
if (nIDEvent == 1) {
KillTimer(1);
- InitRxWindow();
+ InitRxWindows();
}
CDialogEx::OnTimer(nIDEvent);
}
@@ -495,4 +497,13 @@
m_nCurPage++;
UpdatePageData();
}
+}
+
+BOOL CPageTransferLog::PreTranslateMessage(MSG* pMsg)
+{
+ if (pMsg->wParam == VK_RETURN || pMsg->wParam == VK_ESCAPE) {
+ return TRUE;
+ }
+
+ return CDialogEx::PreTranslateMessage(pMsg);
}
\ No newline at end of file
--
Gitblit v1.9.3