From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CGlass.cpp | 373 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 364 insertions(+), 9 deletions(-)
diff --git a/SourceCode/Bond/Servo/CGlass.cpp b/SourceCode/Bond/Servo/CGlass.cpp
index 6d1a1ee..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 {
@@ -10,11 +11,13 @@
m_pBuddy = nullptr;
m_nOriginPort = 0;
m_nOriginSlot = 0;
+ m_bScheduledForProcessing = FALSE;
+ m_pProcessJob = nullptr;
}
CGlass::~CGlass()
{
-
+ reset();
}
void CGlass::reset()
@@ -29,6 +32,7 @@
if (m_pBuddy != nullptr) {
m_pBuddy->release();
+ m_pBuddy = nullptr;
}
}
@@ -48,7 +52,7 @@
return strText;
}
- MaterialsType CGlass::getType()
+ MaterialsType CGlass::getType() const
{
return m_type;
}
@@ -63,7 +67,7 @@
m_strID = pszID;
}
- std::string& CGlass::getID()
+ const std::string& CGlass::getID() const
{
return m_strID;
}
@@ -80,12 +84,51 @@
slot = m_nOriginSlot;
}
+ BOOL CGlass::isScheduledForProcessing()
+ {
+ return m_bScheduledForProcessing;
+ }
+
+ void CGlass::setScheduledForProcessing(BOOL bProcessing)
+ {
+ m_bScheduledForProcessing = bProcessing;
+ }
+
+ CProcessJob* CGlass::getProcessJob()
+ {
+ return m_pProcessJob;
+ }
+
+ void CGlass::setProcessJob(CProcessJob* pProcessJob)
+ {
+ m_pProcessJob = pProcessJob;
+ }
+
CPath* CGlass::getPath()
{
return m_pPath;
}
- CPath* CGlass::getPathWithEq(unsigned int nEqId, unsigned int nUnit)
+ std::string CGlass::getPathDescription() const
+ {
+ std::string strOut, strPath;
+ char szBuffer[256];
+
+ CPath* pTemp = m_pPath;
+ while (pTemp != nullptr) {
+ pTemp->getSimpleDescription(strPath);
+ if (strPath.compare("ARM1") != 0 && strPath.compare("ARM2") != 0) {
+ if (!strOut.empty()) strOut.append(" -> ");
+ strOut.append(strPath);
+ }
+
+ pTemp = pTemp->getNext();
+ }
+
+ return strOut;
+ }
+
+ CPath* CGlass::getPathWithEq(unsigned int nEqId, unsigned int nUnit) const
{
CPath* pTemp = m_pPath;
while (pTemp != nullptr) {
@@ -99,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;
}
@@ -119,6 +162,7 @@
WriteString(ar, m_strID);
ar << m_nOriginPort;
ar << m_nOriginSlot;
+ ar << m_bScheduledForProcessing;
ar << (ULONGLONG)m_pPath;
if (m_pPath != nullptr) {
m_pPath->serialize(ar);
@@ -141,6 +185,7 @@
ReadString(ar, m_strID);
ar >> m_nOriginPort;
ar >> m_nOriginSlot;
+ ar >> m_bScheduledForProcessing;
ar >> ullPath;
if (ullPath != 0) {
m_pPath = new CPath();
@@ -195,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)
@@ -226,11 +276,316 @@
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()
+ {
+ switch (m_state)
+ {
+ case SERVO::GlsState::NoState:
+ return "NoState";
+ break;
+ case SERVO::GlsState::Queued:
+ return "Queued";
+ break;
+ case SERVO::GlsState::InProcess:
+ return "InProcess";
+ break;
+ case SERVO::GlsState::Paused:
+ return "Queued";
+ break;
+ case SERVO::GlsState::Completed:
+ return "Completed";
+ break;
+ case SERVO::GlsState::Aborted:
+ return "Aborted";
+ break;
+ case SERVO::GlsState::Failed:
+ return "Failed";
+ break;
+ default:
+ break;
+ }
+
+ return "";
+ }
+
+ bool CGlass::queue() {
+ if (m_state != GlsState::NoState) return false;
+ markQueued();
+ return true;
+ }
+
+ bool CGlass::start() {
+ if (m_state != GlsState::Queued && m_state != GlsState::Paused)
+ return false;
+ if (!m_tStart.has_value()) markStart();
+ m_state = GlsState::InProcess;
+ return true;
+ }
+
+ bool CGlass::pause() {
+ if (m_state != GlsState::InProcess) return false;
+ m_state = GlsState::Paused;
+ return true;
+ }
+
+ bool CGlass::resume() {
+ if (m_state != GlsState::Paused) return false;
+ m_state = GlsState::InProcess;
+ return true;
+ }
+
+ bool CGlass::complete() {
+ if (m_state != GlsState::InProcess && m_state != GlsState::Paused) return false;
+ m_state = GlsState::Completed;
+ markEnd();
+ return true;
+ }
+
+ bool CGlass::abort() {
+ if (m_state == GlsState::Completed || m_state == GlsState::Aborted || m_state == GlsState::Failed)
+ return false;
+ m_state = GlsState::Aborted;
+ markEnd();
+ return true;
+ }
+
+ bool CGlass::fail(std::string reason)
+ {
+ m_failReason = trimCopy(reason);
+ clampString(m_failReason, 128);
+ m_state = GlsState::Failed;
+ markEnd();
+ return true;
+ }
+
+ std::string CGlass::trimCopy(std::string s)
+ {
+ auto notspace = [](int ch) { return !std::isspace(ch); };
+ s.erase(s.begin(), std::find_if(s.begin(), s.end(), notspace));
+ s.erase(std::find_if(s.rbegin(), s.rend(), notspace).base(), s.end());
+ return s;
+ }
+
+ void CGlass::clampString(std::string& s, size_t maxLen)
+ {
+ if (s.size() > maxLen) s.resize(maxLen);
+ }
+
+ // 鐘舵�佹椂闂存埑锛氭帓闃�/寮�濮�/缁撴潫
+ void CGlass::markQueued()
+ {
+ m_state = GlsState::Queued;
+ m_tQueued = std::chrono::system_clock::now();
+ }
+
+ 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();
+ }
+
+ void CGlass::addParams(std::vector<CParam>& params)
+ {
+ m_params.insert(m_params.end(), params.begin(), params.end());
+ }
+
+ std::vector<CParam>& CGlass::getParams()
+ {
+ return m_params;
+ }
+
+ std::string CGlass::getParamsDescription() const
+ {
+ std::string strOut;
+
+ char szBuffer[256];
+ for (auto p : m_params) {
+ if (!strOut.empty()) strOut.append(",");
+ if (p.getValueType() == PVT_INT) {
+ sprintf_s(szBuffer, 256, "%s:%d", p.getName().c_str(), p.getIntValue());
+ }
+ else if (p.getValueType() == PVT_DOUBLE) {
+ sprintf_s(szBuffer, 256, "%s:%f", p.getName().c_str(), p.getDoubleValue());
+ }
+ strOut.append(szBuffer);
+ }
+
+ 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