From 7ddca21fdb798123239eab9daa390e2702afdff7 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 10 十月 2025 18:02:19 +0800
Subject: [PATCH] 1.ProcessStart和ProcessEnd加调上层时加上SlotNo, 状态也关联到SlotNo, 因为多腔可能 并行工作。 2.加入曲线采集服务端到项目中。
---
SourceCode/Bond/Servo/CGlass.cpp | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/SourceCode/Bond/Servo/CGlass.cpp b/SourceCode/Bond/Servo/CGlass.cpp
index 493ba8d..1a03a98 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;
--
Gitblit v1.9.3