From f6a5e27c91e635ad59d2fd45a52d56c085c7d066 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 26 八月 2025 12:37:22 +0800
Subject: [PATCH] 1.顶部工具条增加按钮"批运行",用于ControlJob模式调度的运行; 2.CMaster增加startBatch,启动批运动模式; 3.CMaster在兼容原单片Glass调试的情况下,增加startBatch调度,开始实现调度功能。
---
SourceCode/Bond/Servo/CReport.cpp | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CReport.cpp b/SourceCode/Bond/Servo/CReport.cpp
index a880f2f..1ab15fa 100644
--- a/SourceCode/Bond/Servo/CReport.cpp
+++ b/SourceCode/Bond/Servo/CReport.cpp
@@ -8,9 +8,12 @@
m_nReportId = 0;
}
- CReport::CReport(unsigned int reportId)
+ CReport::CReport(unsigned int reportId, std::vector<unsigned int>& vids)
{
m_nReportId = reportId;
+ for (auto vid : vids) {
+ m_vids.push_back(vid);
+ }
}
CReport::~CReport()
@@ -58,4 +61,38 @@
return nullptr;
}
+
+ std::vector<CVariable*>& CReport::getVariables()
+ {
+ return m_variabels;
+ }
+
+ std::string CReport::getVariablesIdsText()
+ {
+ std::string strResult, strName;
+ for (int i = 0; i < m_vids.size(); i++) {
+ strResult += std::to_string(m_vids[i]);
+ strResult += "(";
+ strResult += (getVariableName(m_vids[i], strName) ?
+ strName : _T("null"));
+ strResult += ")";
+ if (i != m_vids.size() - 1) {
+ strResult += ",";
+ }
+ }
+
+ return strResult;
+ }
+
+ bool CReport::getVariableName(unsigned int vid, std::string& strName)
+ {
+ for (auto item : m_variabels) {
+ if (item->getVarialbleId() == vid) {
+ strName = item->getName();
+ return true;
+ }
+ }
+
+ return false;
+ }
}
--
Gitblit v1.9.3