From 34f6893ffa45a2eeb3636605d5b7c6289d879aa4 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 20 九月 2025 13:42:48 +0800
Subject: [PATCH] 1.修复和测试Bath调度，更新数据应用到Master时出错的问题；

---
 SourceCode/Bond/Servo/CGlass.cpp |   44 +++++++++++++++++++++++++++++++-------------
 1 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/SourceCode/Bond/Servo/CGlass.cpp b/SourceCode/Bond/Servo/CGlass.cpp
index 493ba8d..f7e71ca 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()
@@ -310,8 +322,10 @@
 	}
 
 	bool CGlass::queue() {
+		LOGI("CGlass::queue 01 %s", m_strID.c_str());
 		if (m_state != GlsState::NoState) return false;
 		markQueued();
+		LOGI("CGlass::queue 02 %s", m_strID.c_str());
 		return true;
 	}
 
@@ -336,9 +350,11 @@
 	}
 
 	bool CGlass::complete() {
+		LOGI("CGlass::complete 01 %s", m_strID.c_str());
 		if (m_state != GlsState::InProcess && m_state != GlsState::Paused) return false;
 		m_state = GlsState::Completed;
 		markEnd();
+		LOGI("CGlass::complete 02 %s", m_strID.c_str());
 		return true;
 	}
 
@@ -381,11 +397,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 +417,7 @@
 		return m_params;
 	}
 
-	std::string CGlass::getParamsDescription()
+	std::string CGlass::getParamsDescription() const
 	{
 		std::string strOut;
 

--
Gitblit v1.9.3