From 625fb6aa20dd6be77a43f45d3c64b9d633417129 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期五, 23 一月 2026 22:08:08 +0800
Subject: [PATCH] 1.实现了“空腔调机曲线模式/生产曲线模式”的切换逻辑，并在模式切换时启动/停止 DAQBridge 的采样缓存，确保空腔也能推送曲线数据； 2.菜单里新增两个选项并显示勾选状态。
---
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