From 2a7efcf2a4bac5e7f9813975c87683ea09fb984e Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期六, 24 一月 2026 10:47:39 +0800
Subject: [PATCH] 1.修复曲线数据未触发问题；
---
SourceCode/Bond/Servo/CGlass.cpp | 164 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 161 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CGlass.cpp b/SourceCode/Bond/Servo/CGlass.cpp
index d1c7a94..9220291 100644
--- a/SourceCode/Bond/Servo/CGlass.cpp
+++ b/SourceCode/Bond/Servo/CGlass.cpp
@@ -1,5 +1,6 @@
-#include "stdafx.h"
+锘�#include "stdafx.h"
#include "CGlass.h"
+#include "Log.h"
namespace SERVO {
@@ -305,7 +306,7 @@
return "Queued";
break;
case SERVO::GlsState::Completed:
- return "Queued";
+ return "Completed";
break;
case SERVO::GlsState::Aborted:
return "Aborted";
@@ -383,7 +384,7 @@
if (s.size() > maxLen) s.resize(maxLen);
}
- // —— 时间戳 & 工具 ——
+ // 鐘舵�佹椂闂存埑锛氭帓闃�/寮�濮�/缁撴潫
void CGlass::markQueued()
{
m_state = GlsState::Queued;
@@ -430,4 +431,161 @@
return strOut;
}
+
+ // ========== SV鏁版嵁鍙ｈ ==========
+ static constexpr size_t MAX_SV_DATA_KEEP = 4800;
+ void CGlass::addSVData(int machineId, const std::string& dataType, const SVDataItem& dataItem) {
+ auto& vec = m_svDatas[machineId][dataType];
+ vec.push_back(dataItem);
+ if (vec.size() > MAX_SV_DATA_KEEP) {
+ vec.erase(vec.begin(), vec.begin() + (vec.size() - MAX_SV_DATA_KEEP));
+ }
+ }
+
+ void CGlass::addSVData(int machineId, const std::string& dataType, double value) {
+ auto now = std::chrono::system_clock::now();
+ auto& vec = m_svDatas[machineId][dataType];
+ vec.emplace_back(now, value);
+ if (vec.size() > MAX_SV_DATA_KEEP) {
+ vec.erase(vec.begin(), vec.begin() + (vec.size() - MAX_SV_DATA_KEEP));
+ }
+ }
+
+ void CGlass::addSVData(int machineId, const std::string& dataType, int64_t timestamp, double value) {
+ // int64_t鏃堕棿杞垚system_clock::time_point
+ std::chrono::system_clock::time_point timePoint{
+ std::chrono::milliseconds(timestamp) // timestamp绮惧害锛氭绉�
+ // 濡傛灉闇�瑕佺簿搴︽洿楂橈紝鍙兘瑕佷娇鐢ㄥ叾浠栨椂闂村崟浣嶏紝濡俿td::chrono::seconds(timestamp)
+ };
+ auto& vec = m_svDatas[machineId][dataType];
+ vec.emplace_back(timePoint, value);
+ if (vec.size() > MAX_SV_DATA_KEEP) {
+ vec.erase(vec.begin(), vec.begin() + (vec.size() - MAX_SV_DATA_KEEP));
+ }
+ }
+
+ void CGlass::addSVData(int machineId, const std::string& dataType, const std::vector<SVDataItem>& dataItems) {
+ auto& dataList = m_svDatas[machineId][dataType];
+ dataList.insert(dataList.end(), dataItems.begin(), dataItems.end());
+ if (dataList.size() > MAX_SV_DATA_KEEP) {
+ dataList.erase(dataList.begin(), dataList.begin() + (dataList.size() - MAX_SV_DATA_KEEP));
+ }
+ }
+
+ std::vector<SVDataItem> CGlass::getSVData(int machineId, const std::string& dataType) const {
+ auto machineIt = m_svDatas.find(machineId);
+ if (machineIt != m_svDatas.end()) {
+ auto dataIt = machineIt->second.find(dataType);
+ if (dataIt != machineIt->second.end()) {
+ return dataIt->second;
+ }
+ }
+ return std::vector<SVDataItem>();
+ }
+
+ std::vector<std::string> CGlass::getSVDataTypes(int machineId) const {
+ std::vector<std::string> types;
+ auto machineIt = m_svDatas.find(machineId);
+ if (machineIt != m_svDatas.end()) {
+ for (const auto& pair : machineIt->second) {
+ types.push_back(pair.first);
+ }
+ }
+ return types;
+ }
+
+ std::unordered_map<std::string, std::vector<SVDataItem>> CGlass::getMachineSVData(int machineId) const {
+ auto it = m_svDatas.find(machineId);
+ if (it != m_svDatas.end()) {
+ return it->second;
+ }
+ return std::unordered_map<std::string, std::vector<SVDataItem>>();
+ }
+
+ const std::unordered_map<int, std::unordered_map<std::string, std::vector<SVDataItem>>>& CGlass::getAllSVData() const {
+ return m_svDatas;
+ }
+
+ bool CGlass::hasSVData(int machineId, const std::string& dataType) const {
+ auto machineIt = m_svDatas.find(machineId);
+ if (machineIt != m_svDatas.end()) {
+ return machineIt->second.find(dataType) != machineIt->second.end();
+ }
+ return false;
+ }
+
+ bool CGlass::hasMachineSVData(int machineId) const {
+ return m_svDatas.find(machineId) != m_svDatas.end();
+ }
+
+ std::vector<int> CGlass::getMachineIdsWithSVData() const {
+ std::vector<int> machineIds;
+ for (const auto& pair : m_svDatas) {
+ machineIds.push_back(pair.first);
+ }
+ return machineIds;
+ }
+
+ void CGlass::clearSVData(int machineId, const std::string& dataType) {
+ auto machineIt = m_svDatas.find(machineId);
+ if (machineIt != m_svDatas.end()) {
+ machineIt->second.erase(dataType);
+ if (machineIt->second.empty()) {
+ m_svDatas.erase(machineIt);
+ }
+ }
+ }
+
+ void CGlass::clearMachineSVData(int machineId) {
+ m_svDatas.erase(machineId);
+ }
+
+ void CGlass::clearAllSVData() {
+ m_svDatas.clear();
+ }
+
+ size_t CGlass::getSVDataCount(int machineId, const std::string& dataType) const {
+ auto machineIt = m_svDatas.find(machineId);
+ if (machineIt != m_svDatas.end()) {
+ auto dataIt = machineIt->second.find(dataType);
+ if (dataIt != machineIt->second.end()) {
+ return dataIt->second.size();
+ }
+ }
+ return 0;
+ }
+
+ size_t CGlass::getMachineSVDataCount(int machineId) const {
+ size_t total = 0;
+ auto machineIt = m_svDatas.find(machineId);
+ if (machineIt != m_svDatas.end()) {
+ for (const auto& pair : machineIt->second) {
+ total += pair.second.size();
+ }
+ }
+ return total;
+ }
+
+ size_t CGlass::getTotalSVDataCount() const {
+ size_t total = 0;
+ for (const auto& machinePair : m_svDatas) {
+ for (const auto& dataPair : machinePair.second) {
+ total += dataPair.second.size();
+ }
+ }
+ return total;
+ }
+
+ std::vector<std::pair<int, SVDataItem>> CGlass::findSVDataByType(const std::string& dataType) const {
+ std::vector<std::pair<int, SVDataItem>> result;
+ for (const auto& machinePair : m_svDatas) {
+ auto dataIt = machinePair.second.find(dataType);
+ if (dataIt != machinePair.second.end()) {
+ for (const auto& item : dataIt->second) {
+ result.emplace_back(machinePair.first, item);
+ }
+ }
+ }
+ return result;
+ }
}
--
Gitblit v1.9.3