From d64036c0510cf06009a7252e318d828fbc2658f0 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 11 九月 2025 09:22:02 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CGlass.cpp | 65 +++++++++++++++++++++++++++++---
1 files changed, 58 insertions(+), 7 deletions(-)
diff --git a/SourceCode/Bond/Servo/CGlass.cpp b/SourceCode/Bond/Servo/CGlass.cpp
index ac69f80..d1c7a94 100644
--- a/SourceCode/Bond/Servo/CGlass.cpp
+++ b/SourceCode/Bond/Servo/CGlass.cpp
@@ -31,6 +31,7 @@
if (m_pBuddy != nullptr) {
m_pBuddy->release();
+ m_pBuddy = nullptr;
}
}
@@ -50,7 +51,7 @@
return strText;
}
- MaterialsType CGlass::getType()
+ MaterialsType CGlass::getType() const
{
return m_type;
}
@@ -65,7 +66,7 @@
m_strID = pszID;
}
- std::string& CGlass::getID()
+ const std::string& CGlass::getID() const
{
return m_strID;
}
@@ -107,7 +108,26 @@
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) {
@@ -121,9 +141,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;
}
@@ -219,9 +239,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)
@@ -250,12 +275,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()
@@ -362,11 +392,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();
}
@@ -379,4 +411,23 @@
{
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;
+ }
}
--
Gitblit v1.9.3