From e48a55eb3cc807fa5a45cf398b6f523e96aa5312 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 15 七月 2025 15:10:31 +0800
Subject: [PATCH] 1.Variable列表显示到界面； 2.从文件中加载CReport列表；
---
SourceCode/Bond/Servo/ServoDlg.cpp | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index baeec28..1b04b6b 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -22,6 +22,9 @@
#include "UserManager.h"
#include "SystemLogManager.h"
#include "PortConfigurationDlg.h"
+#include "CHMPropertyDlg.h"
+#include "CPageVarialbles.h"
+#include "CPageReport.h"
#ifdef _DEBUG
@@ -118,6 +121,8 @@
ON_UPDATE_COMMAND_UI(ID_MENU_FILE_SETTINGS, &CServoDlg::OnUpdateMenuFileSettings)
ON_COMMAND(ID_MENU_FILE_SECSTEST, &CServoDlg::OnMenuFileSecsTest)
ON_UPDATE_COMMAND_UI(ID_MENU_FILE_SECSTEST, &CServoDlg::OnUpdateMenuFileSecsTest)
+ ON_COMMAND(ID_MENU_PROJECT_VARIABLE_LIST, &CServoDlg::OnMenuProjectVarialbleList)
+ ON_UPDATE_COMMAND_UI(ID_MENU_PROJECT_VARIABLE_LIST, &CServoDlg::OnUpdateMenuProjectVarialbleList)
ON_COMMAND(ID_MENU_TEST_MESSAGE_SET, &CServoDlg::OnMenuTestMessageSet)
ON_UPDATE_COMMAND_UI(ID_MENU_TEST_MESSAGE_SET, &CServoDlg::OnUpdateMenuTestMessageSet)
ON_COMMAND(ID_MENU_TEST_MESSAGE_CLEAR, &CServoDlg::OnMenuTestMessageClear)
@@ -552,6 +557,26 @@
pCmdUI->Enable(TRUE);
}
+void CServoDlg::OnMenuProjectVarialbleList()
+{
+ CHMPropertyDlg dlg(_T("Variable|Rreport|Collection Event"), 658, 788);
+
+ CPageReport* pPage1 = new CPageReport();
+ pPage1->Create(IDD_PAGE_REPORT);
+ dlg.addPage(pPage1, "Report");
+
+ CPageVarialbles* pPage2 = new CPageVarialbles();
+ pPage2->Create(IDD_PAGE_VARIABLE);
+ dlg.addPage(pPage2, "Variable");
+
+ dlg.DoModal();
+}
+
+void CServoDlg::OnUpdateMenuProjectVarialbleList(CCmdUI* pCmdUI)
+{
+ pCmdUI->Enable(TRUE);
+}
+
void CServoDlg::OnMenuTestMessageSet()
{
SERVO::CEquipment* pEquipment = m_pPanelMaster->GetActiveEquipment();
--
Gitblit v1.9.3