From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CGlass.cpp | 185 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 171 insertions(+), 14 deletions(-)
diff --git a/SourceCode/Bond/Servo/CGlass.cpp b/SourceCode/Bond/Servo/CGlass.cpp
index 493ba8d..ae2bca0 100644
--- a/SourceCode/Bond/Servo/CGlass.cpp
+++ b/SourceCode/Bond/Servo/CGlass.cpp
@@ -1,5 +1,6 @@
#include "stdafx.h"
#include "CGlass.h"
+#include "Log.h"
namespace SERVO {
@@ -31,6 +32,7 @@
if (m_pBuddy != nullptr) {
m_pBuddy->release();
+ m_pBuddy = nullptr;
}
}
@@ -50,7 +52,7 @@
return strText;
}
- MaterialsType CGlass::getType()
+ MaterialsType CGlass::getType() const
{
return m_type;
}
@@ -65,7 +67,7 @@
m_strID = pszID;
}
- std::string& CGlass::getID()
+ const std::string& CGlass::getID() const
{
return m_strID;
}
@@ -107,7 +109,7 @@
return m_pPath;
}
- std::string CGlass::getPathDescription()
+ std::string CGlass::getPathDescription() const
{
std::string strOut, strPath;
char szBuffer[256];
@@ -115,18 +117,18 @@
CPath* pTemp = m_pPath;
while (pTemp != nullptr) {
pTemp->getSimpleDescription(strPath);
- strOut.append(strPath);
+ if (strPath.compare("ARM1") != 0 && strPath.compare("ARM2") != 0) {
+ if (!strOut.empty()) strOut.append(" -> ");
+ strOut.append(strPath);
+ }
pTemp = pTemp->getNext();
- if (pTemp != nullptr) {
- strOut.append(" -> ");
- }
}
return strOut;
}
- CPath* CGlass::getPathWithEq(unsigned int nEqId, unsigned int nUnit)
+ CPath* CGlass::getPathWithEq(unsigned int nEqId, unsigned int nUnit) const
{
CPath* pTemp = m_pPath;
while (pTemp != nullptr) {
@@ -140,9 +142,9 @@
return nullptr;
}
- void CGlass::addPath(unsigned int nEqId, unsigned int nUnit)
+ void CGlass::addPath(unsigned int nEqId, unsigned int nUnit, unsigned int slot)
{
- CPath* pPath = new CPath(nEqId, nUnit);
+ CPath* pPath = new CPath(nEqId, nUnit, slot);
if (m_pPath == nullptr) {
m_pPath = pPath;
}
@@ -238,9 +240,14 @@
return m_pBuddy;
}
- std::string& CGlass::getBuddyId()
+ const std::string& CGlass::getBuddyId() const
{
return m_strBuddyId;
+ }
+
+ void CGlass::setBuddyId(std::string& strId)
+ {
+ m_strBuddyId = strId;
}
int CGlass::processEnd(unsigned int nEqId, unsigned int nUnit)
@@ -269,12 +276,17 @@
return 0;
}
- InspResult CGlass::getInspResult(unsigned int nEqId, unsigned int nUnit)
+ InspResult CGlass::getInspResult(unsigned int nEqId, unsigned int nUnit) const
{
CPath* pPath = getPathWithEq(nEqId, nUnit);
if (pPath == nullptr) return InspResult::NotInspected;
return pPath->getInspResult();
+ }
+
+ InspResult CGlass::getAOIInspResult() const
+ {
+ return getInspResult(EQ_ID_MEASUREMENT, 0);
}
std::string CGlass::getStateText()
@@ -294,7 +306,7 @@
return "Queued";
break;
case SERVO::GlsState::Completed:
- return "Queued";
+ return "Completed";
break;
case SERVO::GlsState::Aborted:
return "Aborted";
@@ -381,11 +393,13 @@
void CGlass::markStart()
{
+ m_state = GlsState::InProcess;
m_tStart = std::chrono::system_clock::now();
}
void CGlass::markEnd()
{
+ m_state = GlsState::Completed;
m_tEnd = std::chrono::system_clock::now();
}
@@ -399,7 +413,7 @@
return m_params;
}
- std::string CGlass::getParamsDescription()
+ std::string CGlass::getParamsDescription() const
{
std::string strOut;
@@ -417,4 +431,147 @@
return strOut;
}
+
+ // ========== SV数据管理接口实现 ==========
+
+ void CGlass::addSVData(int machineId, const std::string& dataType, const SVDataItem& dataItem) {
+ m_svDatas[machineId][dataType].push_back(dataItem);
+ }
+
+ void CGlass::addSVData(int machineId, const std::string& dataType, double value) {
+ auto now = std::chrono::system_clock::now();
+ m_svDatas[machineId][dataType].emplace_back(now, value);
+ }
+
+ 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是毫秒
+ // 如果是秒，使用：std::chrono::seconds(timestamp)
+ };
+ m_svDatas[machineId][dataType].emplace_back(timePoint, value);
+ }
+
+ 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());
+ }
+
+ 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